Skip to content

P
purescript-gargantext
Commit ef97d9af authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski
Browse files
Options

[tree] rout props refactoring

parent 8798c47a
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
src/Gargantext/Components/App.purs
View file @ ef97d9af
...@@ -64,9 +64,9 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where ...@@ -64,9 +64,9 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
let forested = forestLayout { appReload let forested = forestLayout { appReload
, asyncTasksRef , asyncTasksRef
, backend , backend
, currentRoute: fst route
, frontends , frontends
, handed , handed
, route: fst route
, sessions: fst sessions , sessions: fst sessions
, showLogin: snd showLogin , showLogin: snd showLogin
, treeReloadRef , treeReloadRef
...@@ -74,9 +74,9 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where ...@@ -74,9 +74,9 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
let forestedTB = forestLayoutWithTopBar { appReload let forestedTB = forestLayoutWithTopBar { appReload
, asyncTasksRef , asyncTasksRef
, backend , backend
, currentRoute: fst route
, frontends , frontends
, handed , handed
, route: fst route
, sessions: fst sessions , sessions: fst sessions
, showLogin: snd showLogin , showLogin: snd showLogin
, treeReloadRef , treeReloadRef
...@@ -138,9 +138,9 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where ...@@ -138,9 +138,9 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
appReload appReload
, asyncTasksRef , asyncTasksRef
, backend , backend
, currentRoute: fst route
, frontends , frontends
, handed , handed
, route: fst route
, sessions: fst sessions , sessions: fst sessions
, showLogin: snd showLogin , showLogin: snd showLogin
, treeReloadRef , treeReloadRef
...@@ -161,10 +161,10 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where ...@@ -161,10 +161,10 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
simpleLayout { handed } [ simpleLayout { handed } [
explorerLayout { asyncTasksRef explorerLayout { asyncTasksRef
, backend , backend
, currentRoute: fst route
, frontends , frontends
, graphId , graphId
, handed: fst handed , handed: fst handed
, mCurrentRoute: fst route
, session , session
, sessions: (fst sessions) , sessions: (fst sessions)
, showLogin , showLogin
...@@ -189,9 +189,9 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where ...@@ -189,9 +189,9 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
appReload appReload
, asyncTasksRef , asyncTasksRef
, backend , backend
, currentRoute: fst route
, frontends , frontends
, handed , handed
, route: fst route
, sessions: fst sessions , sessions: fst sessions
, showLogin: snd showLogin , showLogin: snd showLogin
, treeReloadRef , treeReloadRef
......
src/Gargantext/Components/Forest.purs
View file @ ef97d9af
...@@ -27,9 +27,9 @@ type Props = ( ...@@ -27,9 +27,9 @@ type Props = (
appReload :: ReloadS appReload :: ReloadS
, asyncTasksRef :: R.Ref (Maybe GAT.Reductor) , asyncTasksRef :: R.Ref (Maybe GAT.Reductor)
, backend :: R.State (Maybe Backend) , backend :: R.State (Maybe Backend)
, currentRoute :: AppRoute
, frontends :: Frontends , frontends :: Frontends
, handed :: Handed , handed :: Handed
, route :: AppRoute
, sessions :: Sessions , sessions :: Sessions
, showLogin :: R.Setter Boolean , showLogin :: R.Setter Boolean
, treeReloadRef :: R.Ref (Maybe ReloadS) , treeReloadRef :: R.Ref (Maybe ReloadS)
...@@ -44,9 +44,9 @@ forest = R.createElement forestCpt ...@@ -44,9 +44,9 @@ forest = R.createElement forestCpt
cpt { appReload cpt { appReload
, asyncTasksRef , asyncTasksRef
, backend , backend
, currentRoute
, frontends , frontends
, handed , handed
, route
, sessions , sessions
, showLogin , showLogin
, treeReloadRef } _ = do , treeReloadRef } _ = do
...@@ -64,7 +64,7 @@ forest = R.createElement forestCpt ...@@ -64,7 +64,7 @@ forest = R.createElement forestCpt
R2.useCache ( R2.useCache (
frontends frontends
/\ route /\ currentRoute
/\ sessions /\ sessions
/\ fst openNodes /\ fst openNodes
/\ fst appReload /\ fst appReload
...@@ -73,16 +73,16 @@ forest = R.createElement forestCpt ...@@ -73,16 +73,16 @@ forest = R.createElement forestCpt
/\ handed /\ handed
) )
(cpt' openNodes asyncTasks appReload reload showLogin backend) (cpt' openNodes asyncTasks appReload reload showLogin backend)
cpt' openNodes asyncTasks appReload reload showLogin backend (frontends /\ route /\ sessions /\ _ /\ _ /\ _ /\ _ /\ handed) = do cpt' openNodes asyncTasks appReload reload showLogin backend (frontends /\ currentRoute /\ sessions /\ _ /\ _ /\ _ /\ _ /\ handed) = do
pure $ R2.row $ [plus handed showLogin backend] <> trees pure $ R2.row $ [plus handed showLogin backend] <> trees
where where
trees = tree <$> unSessions sessions trees = tree <$> unSessions sessions
tree s@(Session {treeId}) = tree s@(Session {treeId}) =
treeView { appReload treeView { appReload
, asyncTasks , asyncTasks
, currentRoute
, frontends , frontends
, handed , handed
, mCurrentRoute: Just route
, openNodes , openNodes
, reload , reload
, root: treeId , root: treeId
...@@ -120,9 +120,9 @@ type ForestLayoutProps = ( ...@@ -120,9 +120,9 @@ type ForestLayoutProps = (
appReload :: ReloadS appReload :: ReloadS
, asyncTasksRef :: R.Ref (Maybe GAT.Reductor) , asyncTasksRef :: R.Ref (Maybe GAT.Reductor)
, backend :: R.State (Maybe Backend) , backend :: R.State (Maybe Backend)
, currentRoute :: AppRoute
, frontends :: Frontends , frontends :: Frontends
, handed :: R.State Handed , handed :: R.State Handed
, route :: AppRoute
, sessions :: Sessions , sessions :: Sessions
, showLogin :: R.Setter Boolean , showLogin :: R.Setter Boolean
, treeReloadRef :: R.Ref (Maybe ReloadS) , treeReloadRef :: R.Ref (Maybe ReloadS)
...@@ -173,9 +173,9 @@ forestLayoutRaw props = R.createElement forestLayoutRawCpt props ...@@ -173,9 +173,9 @@ forestLayoutRaw props = R.createElement forestLayoutRawCpt props
cpt { appReload cpt { appReload
, asyncTasksRef , asyncTasksRef
, backend , backend
, currentRoute
, frontends , frontends
, handed , handed
, route
, sessions , sessions
, showLogin , showLogin
, treeReloadRef } children = do , treeReloadRef } children = do
...@@ -189,9 +189,9 @@ forestLayoutRaw props = R.createElement forestLayoutRawCpt props ...@@ -189,9 +189,9 @@ forestLayoutRaw props = R.createElement forestLayoutRawCpt props
forest { appReload forest { appReload
, asyncTasksRef , asyncTasksRef
, backend , backend
, currentRoute
, frontends , frontends
, handed: fst handed , handed: fst handed
, route
, sessions , sessions
, showLogin , showLogin
, treeReloadRef } [] , treeReloadRef } []
......
src/Gargantext/Components/Forest/Tree.purs
View file @ ef97d9af
...@@ -46,9 +46,9 @@ thisModule = "Gargantext.Components.Forest.Tree" ...@@ -46,9 +46,9 @@ thisModule = "Gargantext.Components.Forest.Tree"
------------------------------------------------------------------------ ------------------------------------------------------------------------
type CommonProps = ( type CommonProps = (
appReload :: GT.ReloadS appReload :: GT.ReloadS
, currentRoute :: AppRoute
, frontends :: Frontends , frontends :: Frontends
, handed :: GT.Handed , handed :: GT.Handed
, mCurrentRoute :: Maybe AppRoute
, openNodes :: R.State OpenNodes , openNodes :: R.State OpenNodes
, reload :: GT.ReloadS , reload :: GT.ReloadS
, session :: Session , session :: Session
...@@ -69,9 +69,9 @@ treeView = R.createElement elCpt ...@@ -69,9 +69,9 @@ treeView = R.createElement elCpt
cpt { appReload cpt { appReload
, asyncTasks , asyncTasks
, currentRoute
, frontends , frontends
, handed , handed
, mCurrentRoute
, openNodes , openNodes
, reload , reload
, root , root
...@@ -79,9 +79,9 @@ treeView = R.createElement elCpt ...@@ -79,9 +79,9 @@ treeView = R.createElement elCpt
} _children = do } _children = do
pure $ treeLoadView { appReload pure $ treeLoadView { appReload
, asyncTasks , asyncTasks
, currentRoute
, frontends , frontends
, handed , handed
, mCurrentRoute
, openNodes , openNodes
, reload , reload
, root , root
...@@ -96,9 +96,9 @@ treeLoadView = R.createElement elCpt ...@@ -96,9 +96,9 @@ treeLoadView = R.createElement elCpt
cpt { appReload cpt { appReload
, asyncTasks , asyncTasks
, currentRoute
, frontends , frontends
, handed , handed
, mCurrentRoute
, openNodes , openNodes
, reload , reload
, root , root
...@@ -106,9 +106,9 @@ treeLoadView = R.createElement elCpt ...@@ -106,9 +106,9 @@ treeLoadView = R.createElement elCpt
} _children = do } _children = do
let fetch _ = getNodeTree session root let fetch _ = getNodeTree session root
-- let paint loaded = loadedTreeView { asyncTasks -- let paint loaded = loadedTreeView { asyncTasks
-- , currentRoute
-- , frontends -- , frontends
-- , handed -- , handed
-- , mCurrentRoute
-- , openNodes -- , openNodes
-- , reload -- , reload
-- , session -- , session
...@@ -117,9 +117,9 @@ treeLoadView = R.createElement elCpt ...@@ -117,9 +117,9 @@ treeLoadView = R.createElement elCpt
-- } [] -- } []
let paint loaded = loadedTreeViewFirstLevel { appReload let paint loaded = loadedTreeViewFirstLevel { appReload
, asyncTasks , asyncTasks
, currentRoute
, frontends , frontends
, handed , handed
, mCurrentRoute
, openNodes , openNodes
, reload , reload
, session , session
...@@ -151,9 +151,9 @@ type TreeViewProps = ( ...@@ -151,9 +151,9 @@ type TreeViewProps = (
-- cpt { appReload -- cpt { appReload
-- , asyncTasks -- , asyncTasks
-- , currentRoute
-- , frontends -- , frontends
-- , handed -- , handed
-- , mCurrentRoute
-- , openNodes -- , openNodes
-- , reload -- , reload
-- , session -- , session
...@@ -164,9 +164,9 @@ type TreeViewProps = ( ...@@ -164,9 +164,9 @@ type TreeViewProps = (
-- H.div { className: if handed == GT.RightHanded then "righthanded" else "lefthanded" } [ -- H.div { className: if handed == GT.RightHanded then "righthanded" else "lefthanded" } [
-- toHtml { appReload -- toHtml { appReload
-- , asyncTasks -- , asyncTasks
-- , currentRoute
-- , frontends -- , frontends
-- , handed -- , handed
-- , mCurrentRoute
-- , openNodes -- , openNodes
-- , reload -- , reload
-- , session -- , session
...@@ -184,9 +184,9 @@ loadedTreeViewFirstLevel = R.createElement elCpt ...@@ -184,9 +184,9 @@ loadedTreeViewFirstLevel = R.createElement elCpt
cpt { appReload cpt { appReload
, asyncTasks , asyncTasks
, currentRoute
, frontends , frontends
, handed , handed
, mCurrentRoute
, openNodes , openNodes
, reload , reload
, session , session
...@@ -197,9 +197,9 @@ loadedTreeViewFirstLevel = R.createElement elCpt ...@@ -197,9 +197,9 @@ loadedTreeViewFirstLevel = R.createElement elCpt
H.div { className: if handed == GT.RightHanded then "righthanded" else "lefthanded" } [ H.div { className: if handed == GT.RightHanded then "righthanded" else "lefthanded" } [
toHtmlFirstLevel { appReload toHtmlFirstLevel { appReload
, asyncTasks , asyncTasks
, currentRoute
, frontends , frontends
, handed , handed
, mCurrentRoute
, openNodes , openNodes
, reload , reload
, reloadTree: reload , reloadTree: reload
...@@ -229,9 +229,9 @@ type ToHtmlProps = ( ...@@ -229,9 +229,9 @@ type ToHtmlProps = (
-- cpt p@{ appReload -- cpt p@{ appReload
-- , asyncTasks -- , asyncTasks
-- , currentRoute
-- , frontends -- , frontends
-- , handed -- , handed
-- , mCurrentRoute
-- , openNodes -- , openNodes
-- , reload: reload@(_ /\ setReload) -- , reload: reload@(_ /\ setReload)
-- , session -- , session
...@@ -264,13 +264,13 @@ type ToHtmlProps = ( ...@@ -264,13 +264,13 @@ type ToHtmlProps = (
-- pure $ H.li { className: if A.null ary then "no-children" else "with-children" } -- pure $ H.li { className: if A.null ary then "no-children" else "with-children" }
-- [ nodeSpan { appReload -- [ nodeSpan { appReload
-- , asyncTasks -- , asyncTasks
-- , currentRoute
-- , dispatch: pAction -- , dispatch: pAction
-- , folderOpen -- , folderOpen
-- , frontends -- , frontends
-- , handed -- , handed
-- , id -- , id
-- , isLeaf: A.null ary -- , isLeaf: A.null ary
-- , mCurrentRoute
-- , name -- , name
-- , nodeType -- , nodeType
-- , session -- , session
...@@ -301,9 +301,9 @@ toHtmlFirstLevel = R.createElement elCpt ...@@ -301,9 +301,9 @@ toHtmlFirstLevel = R.createElement elCpt
cpt p@{ appReload cpt p@{ appReload
, asyncTasks , asyncTasks
, currentRoute
, frontends , frontends
, handed , handed
, mCurrentRoute
, openNodes , openNodes
, reload: reload@(_ /\ setReload) , reload: reload@(_ /\ setReload)
, reloadTree , reloadTree
...@@ -330,13 +330,13 @@ toHtmlFirstLevel = R.createElement elCpt ...@@ -330,13 +330,13 @@ toHtmlFirstLevel = R.createElement elCpt
pure $ H.li { className: if A.null ary then "no-children" else "with-children" } $ pure $ H.li { className: if A.null ary then "no-children" else "with-children" } $
[ nodeSpan { appReload [ nodeSpan { appReload
, asyncTasks , asyncTasks
, currentRoute
, dispatch: pAction , dispatch: pAction
, folderOpen , folderOpen
, frontends , frontends
, handed , handed
, id , id
, isLeaf: A.null ary , isLeaf: A.null ary
, mCurrentRoute
, name , name
, nodeType , nodeType
, session , session
...@@ -425,11 +425,11 @@ childNodeFirstLevel = R.createElement elCpt ...@@ -425,11 +425,11 @@ childNodeFirstLevel = R.createElement elCpt
cpt props@{ appReload cpt props@{ appReload
, asyncTasks , asyncTasks
, currentRoute
, folderOpen , folderOpen
, id , id
, frontends , frontends
, handed , handed
, mCurrentRoute
, openNodes , openNodes
, reload , reload
, reloadTree , reloadTree
...@@ -439,10 +439,10 @@ childNodeFirstLevel = R.createElement elCpt ...@@ -439,10 +439,10 @@ childNodeFirstLevel = R.createElement elCpt
let fetch _ = getNodeTreeFirstLevel session id let fetch _ = getNodeTreeFirstLevel session id
let paint loaded = childNodeFirstLevelPaint { appReload let paint loaded = childNodeFirstLevelPaint { appReload
, asyncTasks , asyncTasks
, currentRoute
, folderOpen , folderOpen
, frontends , frontends
, handed , handed
, mCurrentRoute
, openNodes , openNodes
, reload: cptReload , reload: cptReload
, reloadTree , reloadTree
......
src/Gargantext/Components/Forest/Tree/Node.purs
View file @ ef97d9af
...@@ -44,11 +44,11 @@ thisModule = "Gargantext.Components.Forest.Tree.Node" ...@@ -44,11 +44,11 @@ thisModule = "Gargantext.Components.Forest.Tree.Node"
type NodeMainSpanProps = ( type NodeMainSpanProps = (
appReload :: GT.ReloadS appReload :: GT.ReloadS
, asyncTasks :: GAT.Reductor , asyncTasks :: GAT.Reductor
, currentRoute :: Routes.AppRoute
, folderOpen :: R.State Boolean , folderOpen :: R.State Boolean
, frontends :: Frontends , frontends :: Frontends
, id :: ID , id :: ID
, isLeaf :: IsLeaf , isLeaf :: IsLeaf
, mCurrentRoute :: Maybe Routes.AppRoute
, name :: Name , name :: Name
, nodeType :: GT.NodeType , nodeType :: GT.NodeType
, setPopoverRef :: R.Ref (Maybe (Boolean -> Effect Unit)) , setPopoverRef :: R.Ref (Maybe (Boolean -> Effect Unit))
...@@ -74,13 +74,13 @@ nodeMainSpan = R.createElement nodeMainSpanCpt ...@@ -74,13 +74,13 @@ nodeMainSpan = R.createElement nodeMainSpanCpt
cpt props@{ appReload cpt props@{ appReload
, asyncTasks: (asyncTasks /\ dispatchAsyncTasks) , asyncTasks: (asyncTasks /\ dispatchAsyncTasks)
, currentRoute
, dispatch , dispatch
, folderOpen , folderOpen
, frontends , frontends
, handed , handed
, id , id
, isLeaf , isLeaf
, mCurrentRoute
, name , name
, nodeType , nodeType
, session , session
...@@ -100,7 +100,7 @@ nodeMainSpan = R.createElement nodeMainSpanCpt ...@@ -100,7 +100,7 @@ nodeMainSpan = R.createElement nodeMainSpanCpt
GT.LeftHanded -> reverse GT.LeftHanded -> reverse
GT.RightHanded -> identity GT.RightHanded -> identity
let isSelected = mCurrentRoute == Routes.nodeTypeAppRoute nodeType (sessionId session) id let isSelected = Just currentRoute == Routes.nodeTypeAppRoute nodeType (sessionId session) id
pure $ H.span (dropProps droppedFile isDragOver) pure $ H.span (dropProps droppedFile isDragOver)
$ ordering $ ordering
......
src/Gargantext/Components/GraphExplorer.purs
View file @ ef97d9af
...@@ -44,10 +44,10 @@ thisModule = "Gargantext.Components.GraphExplorer" ...@@ -44,10 +44,10 @@ thisModule = "Gargantext.Components.GraphExplorer"
type LayoutProps = ( type LayoutProps = (
asyncTasksRef :: R.Ref (Maybe GAT.Reductor) asyncTasksRef :: R.Ref (Maybe GAT.Reductor)
, backend :: R.State (Maybe Backend) , backend :: R.State (Maybe Backend)
, currentRoute :: AppRoute
, frontends :: Frontends , frontends :: Frontends
, graphId :: GET.GraphId , graphId :: GET.GraphId
, handed :: Types.Handed , handed :: Types.Handed
, mCurrentRoute :: AppRoute
, session :: Session , session :: Session
, sessions :: Sessions , sessions :: Sessions
, showLogin :: R.State Boolean , showLogin :: R.State Boolean
...@@ -94,13 +94,13 @@ explorerCpt = R.hooksComponentWithModule thisModule "explorer" cpt ...@@ -94,13 +94,13 @@ explorerCpt = R.hooksComponentWithModule thisModule "explorer" cpt
where where
cpt props@{ asyncTasksRef cpt props@{ asyncTasksRef
, backend , backend
, currentRoute
, frontends , frontends
, graph , graph
, graphId , graphId
, graphVersion , graphVersion
, handed , handed
, hyperdataGraph , hyperdataGraph
, mCurrentRoute
, mMetaData , mMetaData
, session , session
, sessions , sessions
...@@ -160,9 +160,9 @@ explorerCpt = R.hooksComponentWithModule thisModule "explorer" cpt ...@@ -160,9 +160,9 @@ explorerCpt = R.hooksComponentWithModule thisModule "explorer" cpt
, R2.row $ mainLayout handed $ , R2.row $ mainLayout handed $
tree { asyncTasksRef tree { asyncTasksRef
, backend , backend
, currentRoute
, frontends , frontends
, handed , handed
, mCurrentRoute
, reload: treeReload , reload: treeReload
, sessions , sessions
, show: fst controls.showTree , show: fst controls.showTree
...@@ -215,14 +215,14 @@ explorerCpt = R.hooksComponentWithModule thisModule "explorer" cpt ...@@ -215,14 +215,14 @@ explorerCpt = R.hooksComponentWithModule thisModule "explorer" cpt
tree :: Record TreeProps -> R.Element tree :: Record TreeProps -> R.Element
tree { show: false } = RH.div { id: "tree" } [] tree { show: false } = RH.div { id: "tree" } []
tree { asyncTasksRef, backend, frontends, handed, mCurrentRoute: route, reload, sessions, showLogin, treeReloadRef } = tree { asyncTasksRef, backend, frontends, handed, currentRoute, reload, sessions, showLogin, treeReloadRef } =
RH.div {className: "col-md-2 graph-tree"} [ RH.div {className: "col-md-2 graph-tree"} [
forest { appReload: reload forest { appReload: reload
, asyncTasksRef , asyncTasksRef
, backend , backend
, currentRoute
, frontends , frontends
, handed , handed
, route
, sessions , sessions
, showLogin , showLogin
, treeReloadRef } [] , treeReloadRef } []
...@@ -239,9 +239,9 @@ type TreeProps = ...@@ -239,9 +239,9 @@ type TreeProps =
( (
asyncTasksRef :: R.Ref (Maybe GAT.Reductor) asyncTasksRef :: R.Ref (Maybe GAT.Reductor)
, backend :: R.State (Maybe Backend) , backend :: R.State (Maybe Backend)
, currentRoute :: AppRoute
, frontends :: Frontends , frontends :: Frontends
, handed :: Types.Handed , handed :: Types.Handed
, mCurrentRoute :: AppRoute
, reload :: Types.ReloadS , reload :: Types.ReloadS
, sessions :: Sessions , sessions :: Sessions
, show :: Boolean , show :: Boolean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment