Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
purescript-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Przemyslaw Kaminski
purescript-gargantext
Commits
1ddc6d3d
Commit
1ddc6d3d
authored
Mar 11, 2021
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[toestand] fix tasks, sessions loading
parent
efb26a3d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
26 deletions
+37
-26
App.purs
src/Gargantext/Components/App.purs
+10
-2
Router.purs
src/Gargantext/Components/Router.purs
+27
-24
No files found.
src/Gargantext/Components/App.purs
View file @
1ddc6d3d
module Gargantext.Components.App (app) where
module Gargantext.Components.App (app) where
import Data.Maybe (Maybe(..))
import Data.Maybe (Maybe(..))
import Prelude
import Reactix as R
import Reactix as R
import Toestand as T
import Toestand as T
import Gargantext.Prelude
import Gargantext.AsyncTasks as GAT
import Gargantext.Components.App.Data (emptyApp)
import Gargantext.Components.App.Data (emptyApp)
import Gargantext.Components.Router (router)
import Gargantext.Components.Router (router)
import Gargantext.Hooks (useHashRouter)
import Gargantext.Hooks (useHashRouter)
import Gargantext.Router as Router
import Gargantext.Router as Router
import Gargantext.Sessions as Sessions
import Gargantext.Utils.Reactix as R2
import Gargantext.Utils.Reactix as R2
here :: R2.Here
here :: R2.Here
...
@@ -22,6 +25,11 @@ appCpt = here.component "app" cpt where
...
@@ -22,6 +25,11 @@ appCpt = here.component "app" cpt where
cpt _ _ = do
cpt _ _ = do
box <- T.useBox emptyApp -- global data
box <- T.useBox emptyApp -- global data
boxes <- T.useFocusedFields box {} -- read-write access for children
boxes <- T.useFocusedFields box {} -- read-write access for children
tasks <- T.useBox Nothing -- storage for asynchronous tasks
tasks <- T.useBox Nothing -- storage for asynchronous tasks reductor
R.useEffect' $ do
void $ Sessions.load boxes.sessions
tasksReductor <- GAT.useTasks boxes.reloadRoot boxes.reloadForest
R.useEffect' $ do
T.write (Just tasksReductor) tasks
useHashRouter Router.router boxes.route -- Install router to window
useHashRouter Router.router boxes.route -- Install router to window
pure $ router { boxes, tasks } -- Render router component
pure $ router { boxes, tasks } -- Render router component
src/Gargantext/Components/Router.purs
View file @
1ddc6d3d
...
@@ -3,6 +3,7 @@ module Gargantext.Components.Router (router) where
...
@@ -3,6 +3,7 @@ module Gargantext.Components.Router (router) where
import Data.Array (fromFoldable)
import Data.Array (fromFoldable)
import Data.Maybe (Maybe(..))
import Data.Maybe (Maybe(..))
import Reactix as R
import Reactix as R
import Reactix.DOM.HTML as H
import Record as Record
import Record as Record
import Record.Extra as RE
import Record.Extra as RE
import Toestand as T
import Toestand as T
...
@@ -59,8 +60,9 @@ routerCpt = here.component "router" cpt where
...
@@ -59,8 +60,9 @@ routerCpt = here.component "router" cpt where
let sessionNodeProps sId nId = Record.merge { nodeId: nId } $ sessionProps sId
let sessionNodeProps sId nId = Record.merge { nodeId: nId } $ sessionProps sId
showLogin <- T.useLive T.unequal boxes.showLogin
showLogin <- T.useLive T.unequal boxes.showLogin
route' <- T.useLive T.unequal boxes.route
route' <- T.useLive T.unequal boxes.route
pure $ if showLogin then login' boxes
pure $ R.fragment
else case route' of
[ if showLogin then login' boxes else H.div {} []
, case route' of
GR.Annuaire s n -> annuaire (sessionNodeProps s n) []
GR.Annuaire s n -> annuaire (sessionNodeProps s n) []
GR.ContactPage s a n -> contact (Record.merge { annuaireId: a } $ sessionNodeProps s n) []
GR.ContactPage s a n -> contact (Record.merge { annuaireId: a } $ sessionNodeProps s n) []
GR.Corpus s n -> corpus (sessionNodeProps s n) []
GR.Corpus s n -> corpus (sessionNodeProps s n) []
...
@@ -82,6 +84,7 @@ routerCpt = here.component "router" cpt where
...
@@ -82,6 +84,7 @@ routerCpt = here.component "router" cpt where
GR.Team s n -> team (sessionNodeProps s n) []
GR.Team s n -> team (sessionNodeProps s n) []
GR.Texts s n -> texts (sessionNodeProps s n) []
GR.Texts s n -> texts (sessionNodeProps s n) []
GR.UserPage s n -> user (sessionNodeProps s n) []
GR.UserPage s n -> user (sessionNodeProps s n) []
]
forested :: R2.Component Props
forested :: R2.Component Props
forested = R.createElement forestedCpt
forested = R.createElement forestedCpt
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment