[REFACTOR] re-org tabs state and actions

src/Gargantext/Pages/Corpus.purs

@@ -12,36 +12,24 @@ import Effect.Aff (Aff)
 import React.DOM (div, h3, hr, i, p, text)
 import React.DOM.Props (className, style)
 import Thermite ( Render, Spec, PerformAction, focus
-                , simpleSpec, modifyState)
+                , simpleSpec, modifyState, noState)
 --------------------------------------------------------
 import Gargantext.Prelude
 import Gargantext.Components.Node (NodePoly(..))
 import Gargantext.Config      (toUrl, NodeType(..), End(..))
 import Gargantext.Config.REST (get)
----------------------------------------------------------
--- Tabs
-import Gargantext.Pages.Corpus.Tabs.Documents as D
-import Gargantext.Pages.Corpus.Tabs.Sources   as S
-import Gargantext.Pages.Corpus.Tabs.Authors   as A
-import Gargantext.Pages.Corpus.Tabs.Terms     as T
-import Gargantext.Components.Tab as Tab
+import Gargantext.Pages.Corpus.Tabs.States as Tabs
+import Gargantext.Pages.Corpus.Tabs.Actions as Tabs
+import Gargantext.Pages.Corpus.Tabs.Specs as Tabs
 -------------------------------------------------------------------
 type HeaderState = { info :: Maybe (NodePoly CorpusInfo) }
 type State = { headerView  :: HeaderState
-             , docsView    :: D.State
-             , authorsView :: A.State
-             , sourcesView :: S.State
-             , termsView   :: T.State
-             , activeTab   :: Int
+             , tabsView    :: Tabs.State
              }
 
 initialState :: State
 initialState = { headerView  : { info : Nothing }
-               , docsView    : D.initialState
-               , authorsView : A.initialState
-               , sourcesView : S.initialState
-               , termsView   : T.initialState
-               , activeTab : 0
+               , tabsView    : Tabs.initialState
                }
 
 ------------------------------------------------------------------------
@@ -51,29 +39,14 @@ _info = lens (\s -> s.info) (\s ss -> s{info = ss})
 _headerView :: forall a b. Lens' { headerView :: a | b } a
 _headerView = lens (\s -> s.headerView) (\s ss -> s{headerView = ss})
 
-_doclens :: Lens' State D.State
-_doclens = lens (\s -> s.docsView) (\s ss -> s {docsView = ss})
-
-_authorlens :: Lens' State A.State
-_authorlens = lens (\s -> s.authorsView) (\s ss -> s {authorsView = ss})
-
-_sourcelens :: Lens' State S.State
-_sourcelens = lens (\s -> s.sourcesView) (\s ss -> s {sourcesView = ss})
-
-_termslens :: Lens' State T.State
-_termslens = lens (\s -> s.termsView) (\s ss -> s {termsView = ss})
-
-_tablens :: Lens' State Tab.State
-_tablens = lens (\s -> s.activeTab) (\s ss -> s {activeTab = ss})
+_tabsView :: forall a b. Lens' { tabsView :: a | b } a
+_tabsView = lens (\s -> s.tabsView) (\s ss -> s{tabsView = ss})
 ------------------------------------------------------------------------
 data HeaderAction = Load Int
 
-data Action = HeaderA       HeaderAction
-            | DocviewA      D.Action
-            | AuthorviewA   A.Action
-            | SourceviewA   S.Action
-            | TermsviewA    T.Action
-            | TabViewA      Tab.Action
+data Action
+  = HeaderA HeaderAction
+  | TabsA   Tabs.Action
 
 _headerAction :: Prism' Action HeaderAction
 _headerAction = prism HeaderA \ action ->
@@ -81,35 +54,12 @@ _headerAction = prism HeaderA \ action ->
     HeaderA haction -> Right haction
     _-> Left action
 
-_docAction :: Prism' Action D.Action
-_docAction = prism DocviewA \ action ->
-  case action of
-    DocviewA laction -> Right laction
-    _-> Left action
-
-_authorAction :: Prism' Action A.Action
-_authorAction = prism AuthorviewA \ action ->
-  case action of
-    AuthorviewA laction -> Right laction
-    _-> Left action
-
-_sourceAction :: Prism' Action S.Action
-_sourceAction = prism SourceviewA \ action ->
-  case action of
-    SourceviewA laction -> Right laction
-    _-> Left action
-
-_termsAction :: Prism' Action T.Action
-_termsAction = prism TermsviewA \ action ->
+_tabsAction :: Prism' Action Tabs.Action
+_tabsAction = prism TabsA \ action ->
   case action of
-    TermsviewA laction -> Right laction
+    TabsA taction -> Right taction
     _-> Left action
 
-_tabAction :: Prism' Action Tab.Action
-_tabAction = prism TabViewA \ action ->
-  case action of
-    TabViewA laction -> Right laction
-    _-> Left action
 
 _loadAction :: Prism' HeaderAction Int
 _loadAction = prism Load \ action ->
@@ -153,7 +103,8 @@ instance decodeCorpusInfo :: DecodeJson CorpusInfo where
 
 ------------------------------------------------------------------------
 layout :: Spec State {} Action
-layout = focus _headerView _headerAction corpusHeaderSpec <> facets
+layout = focus _headerView _headerAction corpusHeaderSpec
+      <> focus _tabsView _tabsAction Tabs.statefulTabs
 
 corpusHeaderSpec :: Spec HeaderState {} HeaderAction
 corpusHeaderSpec = simpleSpec performAction render
@@ -203,27 +154,3 @@ performAction (Load nId) _ _ = do
 
 getNode :: Int -> Aff (Either String (NodePoly CorpusInfo))
 getNode id = get $ toUrl Back Node id
-
-------------------------------------------------------------------------
--- Tabs
-------------------------------------------------------------------------
-facets :: Spec State {} Action
-facets =
-  Tab.tabs _tablens _tabAction $ fromFoldable [ Tuple "Documents" docPageSpec
-                                              , Tuple "Authors"   authorPageSpec
-                                              , Tuple "Sources"   sourcePageSpec
-                                              , Tuple "Terms"     termsPageSpec
-                                              ]
-
-docPageSpec :: Spec State {} Action
-docPageSpec = focus _doclens _docAction D.layoutDocview
-
-authorPageSpec :: Spec State  {} Action
-authorPageSpec = focus _authorlens _authorAction A.authorspec'
-
-sourcePageSpec :: Spec State {} Action
-sourcePageSpec = focus _sourcelens _sourceAction S.sourcespec'
-
-termsPageSpec :: Spec State {} Action
-termsPageSpec = focus _termslens _termsAction T.termSpec'
-

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

@@ -46,6 +46,3 @@ _tabAction = prism TabViewA \ action ->
   case action of
     TabViewA laction -> Right laction
     _-> Left action
-
-
-

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

@@ -16,15 +16,15 @@ import Gargantext.Components.Tab as Tab
 import Thermite (Spec, focus, hideState)
 
 
-pureTab1 :: Spec {} {} Void
-pureTab1 = hideState initialState statefulTab1
-
-statefulTab1 :: Spec State {} Action
-statefulTab1 =
-  Tab.tabs _tablens _tabAction $ fromFoldable [ Tuple "Doc View"    docPageSpec
-                                              , Tuple "Author View" authorPageSpec
-                                              , Tuple "Source View" sourcePageSpec
-                                              , Tuple "Terms View"  termsPageSpec
+pureTabs :: Spec {} {} Void
+pureTabs = hideState initialState statefulTabs
+
+statefulTabs :: Spec State {} Action
+statefulTabs =
+  Tab.tabs _tablens _tabAction $ fromFoldable [ Tuple "Documents" docPageSpec
+                                              , Tuple "Authors"   authorPageSpec
+                                              , Tuple "Sources"   sourcePageSpec
+                                              , Tuple "Terms"     termsPageSpec
                                               ]
 
 docPageSpec :: Spec State {} Action

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

 module Gargantext.Pages.Corpus.Tabs.States where
 
 import Data.Lens (Lens', lens)
-import Gargantext.Pages.Corpus.Tabs.Documents as DV
-import Gargantext.Pages.Corpus.Tabs.Sources as SV
-import Gargantext.Pages.Corpus.Tabs.Authors as AV
-import Gargantext.Pages.Corpus.Tabs.Terms as TV
+import Gargantext.Pages.Corpus.Tabs.Documents as D
+import Gargantext.Pages.Corpus.Tabs.Sources   as S
+import Gargantext.Pages.Corpus.Tabs.Authors   as A
+import Gargantext.Pages.Corpus.Tabs.Terms     as T
 import Gargantext.Components.Tab as Tab
 
 
 type State =
-  { docview :: DV.State
-  , authorview :: AV.State
-  , sourceview :: SV.State
-  , termsview :: TV.State
+  { docsView    :: D.State
+  , authorsView :: A.State
+  , sourcesView :: S.State
+  , termsView   :: T.State
   , activeTab   :: Int
   }
 
 initialState :: State
 initialState =
-  { docview    : DV.initialState
-  , authorview : AV.initialState
-  , sourceview : SV.initialState
-  , termsview  : TV.initialState
+  { docsView    : D.initialState
+  , authorsView : A.initialState
+  , sourcesView : S.initialState
+  , termsView   : T.initialState
   , activeTab : 0
   }
 
-_doclens :: Lens' State DV.State
-_doclens = lens (\s -> s.docview) (\s ss -> s {docview = ss})
+_doclens :: Lens' State D.State
+_doclens = lens (\s -> s.docsView) (\s ss -> s {docsView = ss})
 
-_authorlens :: Lens' State AV.State
-_authorlens = lens (\s -> s.authorview) (\s ss -> s {authorview = ss})
+_authorlens :: Lens' State A.State
+_authorlens = lens (\s -> s.authorsView) (\s ss -> s {authorsView = ss})
 
-_sourcelens :: Lens' State SV.State
-_sourcelens = lens (\s -> s.sourceview) (\s ss -> s {sourceview = ss})
+_sourcelens :: Lens' State S.State
+_sourcelens = lens (\s -> s.sourcesView) (\s ss -> s {sourcesView = ss})
 
-_termslens :: Lens' State TV.State
-_termslens = lens (\s -> s.termsview) (\s ss -> s {termsview = ss})
+_termslens :: Lens' State T.State
+_termslens = lens (\s -> s.termsView) (\s ss -> s {termsView = ss})
 
 _tablens :: Lens' State Tab.State
 _tablens = lens (\s -> s.activeTab) (\s ss -> s {activeTab = ss})
-
-
-
-

src/Gargantext/Pages/Layout.purs

@@ -9,6 +9,7 @@ import Gargantext.Pages.Layout.Specs.AddCorpus as AC
 import Gargantext.Pages.Corpus                as Corpus
 import Gargantext.Pages.Corpus.Document       as Document
 import Gargantext.Pages.Corpus.Tabs.Documents as D
+import Gargantext.Pages.Corpus.Tabs.Actions   as TabsA
 import Gargantext.Pages.Corpus.Graph          as GE
 -- import Gargantext.Pages.Corpus.Tabs.Terms.NgramsTable as NG
 
@@ -38,7 +39,7 @@ dispatchAction dispatcher _ AddCorpus = do
 
 dispatchAction dispatcher _ (Corpus n) = do
   dispatcher $ SetRoute     $ Corpus n
-  dispatcher $ CorpusAction $ Corpus.DocviewA $ D.UpdateNodeId n
+  dispatcher $ CorpusAction $ Corpus.TabsA    $ TabsA.DocviewA $ D.UpdateNodeId n
   dispatcher $ CorpusAction $ Corpus.HeaderA  $ Corpus.Load    n
 
 dispatchAction dispatcher _ SearchView = do