Revert "Extra props for loader"

This reverts commit 89c0af1a.

src/Gargantext/Components/Loader.purs

@@ -12,24 +12,22 @@ import Thermite (Render, PerformAction, simpleSpec, modifyState_, createReactSpe
 
 data Action path = ForceReload | SetPath path
 
-type InnerProps path loaded props =
+type InnerProps path loaded =
   { path     :: path
   , loaded   :: Maybe loaded
   , dispatch :: Action path -> Effect Unit
-  , props    :: props
   , children :: Children
   }
 
-type PropsRow path loaded props row =
+type PropsRow path loaded row =
   ( path      :: path
-  , component :: ReactClass (InnerProps path loaded props)
-  , props     :: props
+  , component :: ReactClass (InnerProps path loaded)
   | row
   )
 
-type Props path loaded props = Record (PropsRow path loaded props (children :: Children))
+type Props path loaded = Record (PropsRow path loaded (children :: Children))
 
-type Props' path loaded props = Record (PropsRow path loaded props ())
+type Props' path loaded = Record (PropsRow path loaded ())
 
 type State path loaded = { currentPath :: path, loaded :: Maybe loaded }
 
@@ -61,23 +59,23 @@ createLoaderClass' name loader render =
 
     {spec, dispatcher} = createReactSpec (simpleSpec performAction render) initialState
 
-createLoaderClass :: forall path loaded props
+createLoaderClass :: forall path loaded
                    . Eq path
                   => String
                   -> (path -> Aff loaded)
-                  -> ReactClass (Record (PropsRow path loaded props (children :: Children)))
+                  -> ReactClass (Record (PropsRow path loaded (children :: Children)))
 createLoaderClass name loader =
     createLoaderClass' name loader render
   where
-    render :: Render (State path loaded) (Props' path loaded props) (Action path)
-    render dispatch {component, props} {currentPath, loaded} c =
-      [React.createElement component {path: currentPath, loaded, dispatch, props} c]
+    render :: Render (State path loaded) (Props' path loaded) (Action path)
+    render dispatch {component} {currentPath, loaded} c =
+      [React.createElement component {path: currentPath, loaded, dispatch} c]
 
 {-
-createLoaderClass :: forall path loaded props
+createLoaderClass :: forall path loaded
                    . String
                   -> (path -> Aff loaded)
-                  -> ReactClass (Props path loaded props)
+                  -> ReactClass (Props path loaded)
 createLoaderClass name loader = React.component name mk
   where
     mk this =

src/Gargantext/Pages/Annuaire.purs

@@ -28,9 +28,7 @@ import Gargantext.Pages.Annuaire.User.Contacts.Types (Contact(..), HyperData(..)
 type Props =
   { path :: Int
   , loaded :: Maybe AnnuaireInfo
-  , dispatch :: Loader.Action Int -> Effect Unit
-  , props :: {}
-  }
+  , dispatch :: Loader.Action Int -> Effect Unit }
 
 data Action
   = TabsA   Tab.Action
@@ -78,7 +76,6 @@ layout = simpleSpec defaultPerformAction render
       [ annuaireLoader
           { path: annuaireId
           , component: createClass "LoadedAnnuaire" loadedAnnuaireSpec (const {})
-          , props: {}
           } ]
 
 loadedAnnuaireSpec :: Spec {} Props Void
@@ -100,7 +97,6 @@ loadedAnnuaireSpec = simpleSpec defaultPerformAction render
       , pageLoader
           { path: initialPageParams nodeId
           , annuaireInfo
-          , props: {}
           }
       ]
 
@@ -112,7 +108,6 @@ initialPageParams nodeId = {nodeId, params: T.initialParams}
 type PageLoaderProps =
   { path :: PageParams
   , annuaireInfo :: AnnuaireInfo
-  , props :: {}
   }
 
 renderPage :: forall props path.
@@ -142,7 +137,7 @@ renderPage dispatch {annuaireInfo}
   where
     rows = (\c -> {row: renderContactCells c, delete: false}) <$> res
 
-pageLoaderClass :: ReactClass { path :: PageParams, annuaireInfo :: AnnuaireInfo, children :: Children, props :: {} }
+pageLoaderClass :: ReactClass { path :: PageParams, annuaireInfo :: AnnuaireInfo, children :: Children }
 pageLoaderClass = Loader.createLoaderClass' "AnnuairePageLoader" loadPage renderPage
 
 pageLoader :: PageLoaderProps -> ReactElement
@@ -215,8 +210,8 @@ getAnnuaireInfo :: Int -> Aff AnnuaireInfo
 getAnnuaireInfo id = get $ toUrl Back Node (Just id)
 ------------------------------------------------------------------------------
 
-annuaireLoaderClass :: ReactClass (Loader.Props Int AnnuaireInfo {})
+annuaireLoaderClass :: ReactClass (Loader.Props Int AnnuaireInfo)
 annuaireLoaderClass = Loader.createLoaderClass "AnnuaireLoader" getAnnuaireInfo
 
-annuaireLoader :: Loader.Props' Int AnnuaireInfo {} -> ReactElement
+annuaireLoader :: Loader.Props' Int AnnuaireInfo -> ReactElement
 annuaireLoader props = React.createElement annuaireLoaderClass props []

src/Gargantext/Pages/Corpus.purs

@@ -54,7 +54,6 @@ layout = simpleSpec defaultPerformAction render
     render _ {nodeId} _ _ =
       [ corpusLoader { path: nodeId
                      , component: createClass "Layout" layout' initialState
-                     , props: {}
                      } ]
 
 layout' :: Spec State Props Action
@@ -85,8 +84,8 @@ corpusHeaderSpec = simpleSpec defaultPerformAction render
 getCorpus :: Int -> Aff (NodePoly CorpusInfo)
 getCorpus = get <<< toUrl Back Corpus <<< Just
 
-corpusLoaderClass :: ReactClass (Loader.Props Int (NodePoly CorpusInfo) {})
+corpusLoaderClass :: ReactClass (Loader.Props Int (NodePoly CorpusInfo))
 corpusLoaderClass = createLoaderClass "CorpusLoader" getCorpus
 
-corpusLoader :: Loader.Props' Int (NodePoly CorpusInfo) {} -> ReactElement
+corpusLoader :: Loader.Props' Int (NodePoly CorpusInfo) -> ReactElement
 corpusLoader props = React.createElement corpusLoaderClass props []

src/Gargantext/Pages/Corpus/Tabs/Ngrams/NgramsTable.purs

@@ -57,7 +57,6 @@ type PageParams = {nodeId :: Int, params :: T.Params}
 type Props' = { path :: PageParams
               , loaded :: Maybe NgramsTable
               , dispatch :: Loader.Action PageParams -> Effect Unit
-              , props :: {}
               }
 
 type NgramsTerm = String
@@ -496,10 +495,10 @@ getTable tab = get <<< toUrl Back (Ngrams tab Nothing)
 loadPage :: PageParams -> Aff NgramsTable
 loadPage {nodeId} = getTable TabTerms (Just nodeId) -- TODO this ignores params
 
-ngramsLoaderClass :: ReactClass (Loader.Props PageParams NgramsTable {})
+ngramsLoaderClass :: ReactClass (Loader.Props PageParams NgramsTable)
 ngramsLoaderClass = Loader.createLoaderClass "NgramsLoader" loadPage
 
-ngramsLoader :: Loader.Props' PageParams NgramsTable {} -> ReactElement
+ngramsLoader :: Loader.Props' PageParams NgramsTable -> ReactElement
 ngramsLoader props = React.createElement ngramsLoaderClass props []
 
 ngramsTableSpec :: Spec {} Props Void
@@ -509,7 +508,6 @@ ngramsTableSpec = simpleSpec defaultPerformAction render
     render _ {path: nodeId} _ _ =
       -- TODO: ignored mode, ignored loaded: corpusInfo
       [ ngramsLoader { path: initialPageParams nodeId
-                     , props: {}
                      , component: createClass "NgramsTableLayout" ngramsTableSpec' initialState
                      } ]
 

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

@@ -33,7 +33,7 @@ docPageSpec = focus _doclens _docAction DV.layoutDocview
 
 ngramsViewSpec :: {mode :: NV.Mode} -> Spec State Props Action
 ngramsViewSpec {mode} =
-  cmapProps (\{loaded, path, dispatch,props} -> {mode,loaded,path,dispatch,props})
+  cmapProps (\{loaded, path, dispatch} -> {mode,loaded,path, dispatch})
             (focus _ngramsView _NgramViewA NV.ngramsTableSpec)
 
 authorPageSpec :: Spec State Props Action

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

@@ -49,7 +49,6 @@ type PropsRow =
   ( path :: Int
   , loaded :: Maybe (NodePoly CorpusInfo)
   , dispatch :: Loader.Action Int -> Effect Unit
-  , props :: {}
   )
 type Props = Record PropsRow