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
134
Issues
134
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
gargantext
purescript-gargantext
Commits
8e0b5f8d
Commit
8e0b5f8d
authored
Oct 02, 2019
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[READING+FEAT] Forest in Graph Explorer.
parent
b7e624dc
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
192 additions
and
163 deletions
+192
-163
App.purs
src/Gargantext/Components/App.purs
+20
-17
Forest.purs
src/Gargantext/Components/Forest.purs
+9
-6
GraphExplorer.purs
src/Gargantext/Components/GraphExplorer.purs
+21
-19
Controls.purs
src/Gargantext/Components/GraphExplorer/Controls.purs
+16
-17
NgramsTable.purs
src/Gargantext/Components/NgramsTable.purs
+8
-8
Core.purs
src/Gargantext/Components/NgramsTable/Core.purs
+3
-3
RandomText.purs
src/Gargantext/Components/RandomText.purs
+1
-1
Tree.purs
src/Gargantext/Components/Tree.purs
+23
-14
Config.purs
src/Gargantext/Config.purs
+5
-5
Ends.purs
src/Gargantext/Ends.purs
+3
-3
Loader.purs
src/Gargantext/Hooks/Loader.purs
+16
-7
Annuaire.purs
src/Gargantext/Pages/Annuaire.purs
+6
-6
Document.purs
src/Gargantext/Pages/Corpus/Document.purs
+19
-19
Home.purs
src/Gargantext/Pages/Home.purs
+2
-1
Lists.purs
src/Gargantext/Pages/Lists.purs
+3
-3
Texts.purs
src/Gargantext/Pages/Texts.purs
+1
-1
Router.purs
src/Gargantext/Router.purs
+15
-12
Routes.purs
src/Gargantext/Routes.purs
+16
-16
Sessions.purs
src/Gargantext/Sessions.purs
+3
-3
Spec.purs
test/Gargantext/Components/NgramsTable/Spec.purs
+2
-2
No files found.
src/Gargantext/Components/App.purs
View file @
8e0b5f8d
...
...
@@ -41,13 +41,15 @@ appCpt :: R.Component ()
appCpt = R.hooksComponent "G.C.App.app" cpt where
frontends = defaultFrontends
cpt _ _ = do
sessions <- useSessions
route <- useHashRouter router Home
showLogin <- R.useState' false
sessions <- useSessions
route <- useHashRouter router Home
showLogin <- R.useState' false
showCorpus <- R.useState' false
let tree = forestLayout frontends (fst sessions) (fst route) (snd showLogin)
let mCurrentRoute = Just $ fst route
let backends = fromFoldable defaultBackends
let tree = forestLayout frontends (fst sessions) (fst route) (snd showLogin)
let mCurrentRoute = fst route
let backends = fromFoldable defaultBackends
pure $ case fst showLogin of
true -> tree $ login { sessions, backends, visible: showLogin }
false ->
...
...
@@ -55,15 +57,15 @@ appCpt = R.hooksComponent "G.C.App.app" cpt where
Nothing -> tree $ homeLayout EN
Just session ->
case (fst route) of
Home -> tree $ homeLayout EN
Login -> login { sessions, backends, visible: showLogin }
Home
-> tree $ homeLayout EN
Login
-> login { sessions, backends, visible: showLogin }
Folder _ -> tree $ folder {}
Corpus nodeId -> tree $ corpusLayout { nodeId }
Texts nodeId -> tree $ textsLayout { nodeId, session }
Lists nodeId -> tree $ listsLayout { nodeId, session }
Dashboard -> tree $ dashboardLayout {}
Annuaire
annuaireId -> tree $ annuaireLayout { annuair
eId, session }
UserPage nodeId -> tree $ userLayout { nodeId, session }
Texts
nodeId -> tree $ textsLayout { nodeId, session }
Lists
nodeId -> tree $ listsLayout { nodeId, session }
Dashboard
_nodeId
-> tree $ dashboardLayout {}
Annuaire
nodeId -> tree $ annuaireLayout { nod
eId, session }
UserPage
nodeId -> tree $ userLayout { nodeId, session }
ContactPage nodeId -> tree $ userLayout { nodeId, session }
CorpusDocument corpusId listId nodeId ->
tree $ documentLayout { nodeId, listId, session, corpusId: Just corpusId }
...
...
@@ -71,7 +73,7 @@ appCpt = R.hooksComponent "G.C.App.app" cpt where
tree $ documentLayout { nodeId, listId, session, corpusId: Nothing }
PGraphExplorer graphId ->
simpleLayout (fst sessions) $
explorerLayout { graphId, mCurrentRoute, session, treeId: Nothing, frontends
}
explorerLayout { graphId, mCurrentRoute, session, treeId: Nothing, frontends}
forestLayout :: Frontends -> Sessions -> AppRoute -> R2.Setter Boolean -> R.Element -> R.Element
forestLayout frontends sessions route showLogin child =
...
...
@@ -81,8 +83,9 @@ forestLayout frontends sessions route showLogin child =
main =
R.fragment
[ H.div {className: "col-md-2", style: {paddingTop: "60px"}}
[ forest {sessions, route, frontends, showLogin} ]
, mainPage child ]
[ forest {sessions, route, frontends, showLogin} ]
, mainPage child
]
-- Simple layout does not accommodate the tree
simpleLayout :: Sessions -> R.Element -> R.Element
...
...
@@ -218,7 +221,7 @@ liNav (LiNav { title : title'
footer :: {} -> R.Element
footer props = R.createElement footerCpt props []
footerCpt :: R.Component ()
footerCpt :: R.Component ()
footerCpt = R.staticComponent "G.C.Layout.footer" cpt
where
cpt _ _ =
...
...
src/Gargantext/Components/Forest.purs
View file @
8e0b5f8d
module Gargantext.Components.Forest where
import Prelude (const, show
, discard
)
import Prelude (const, show)
import Data.Maybe (Maybe(..))
import DOM.Simple.Console (log)
import Reactix as R
import Reactix.DOM.HTML as H
import Gargantext.Ends (Frontends)
...
...
@@ -12,8 +11,8 @@ import Gargantext.Components.Tree (treeView)
import Gargantext.Utils.Reactix as R2
type Props =
( sessions :: Sessions
, route :: AppRoute
( sessions
:: Sessions
, route
:: AppRoute
, frontends :: Frontends
, showLogin :: R2.Setter Boolean )
...
...
@@ -31,8 +30,12 @@ forestCpt = R.staticComponent "G.C.Forest.forest" cpt where
Just s@(Session {treeId}) ->
R.fragment
[ H.text (show s)
, treeView { root: treeId, frontends, mCurrentRoute: Just route, session: s } ]
, treeView { root: treeId
, frontends
, mCurrentRoute: Just route
, session: s }
]
plus :: R2.Setter Boolean -> R.Element
plus showLogin = H.button {on: {click}} [ H.text "+" ]
where
...
...
src/Gargantext/Components/GraphExplorer.purs
View file @
8e0b5f8d
...
...
@@ -7,7 +7,7 @@ import Data.Foldable (foldMap)
import Data.Int (toNumber)
import Data.Maybe (Maybe(..))
import Data.Sequence as Seq
import Data.Tuple (fst)
import Data.Tuple (fst
,snd
)
import Data.Tuple.Nested ((/\))
import Effect.Aff (Aff)
import Reactix as R
...
...
@@ -21,25 +21,27 @@ import Gargantext.Components.GraphExplorer.Sidebar as Sidebar
import Gargantext.Components.GraphExplorer.ToggleButton as Toggle
import Gargantext.Components.GraphExplorer.Types as GET
import Gargantext.Components.Graph as Graph
import Gargantext.Components.
Tree as Tree
import Gargantext.Components.
Forest (forest)
import Gargantext.Config.REST (get)
import Gargantext.Ends (Frontends, url)
import Gargantext.Routes (SessionRoute(NodeAPI), AppRoute)
import Gargantext.Sessions (Session)
import Gargantext.Sessions (Session
, Sessions(..)
)
import Gargantext.Types (NodeType(Graph))
type GraphId = Int
type LayoutProps =
( graphId :: GraphId
, mCurrentRoute ::
Maybe
AppRoute
, mCurrentRoute :: AppRoute
, treeId :: Maybe Int
, session :: Session
, frontends :: Frontends )
, frontends :: Frontends
)
type Props = ( graph :: Maybe Graph.Graph | LayoutProps )
--------------------------------------------------------------
explorerLayout :: Record LayoutProps -> R.Element
explorerLayout props = R.createElement explorerLayoutCpt props []
...
...
@@ -52,6 +54,7 @@ explorerLayoutCpt = R.hooksComponent "G.C.GraphExplorer.explorerLayout" cpt
handler loaded = explorer {graphId, mCurrentRoute, treeId, session, graph, frontends}
where graph = Just (convert loaded)
--------------------------------------------------------------
explorer :: Record Props -> R.Element
explorer props = R.createElement explorerCpt props []
...
...
@@ -61,13 +64,12 @@ explorerCpt = R.hooksComponent "G.C.GraphExplorer.explorer" cpt
cpt {session, graphId, mCurrentRoute, treeId, graph, frontends} _ = do
controls <- Controls.useGraphControls
state <- useExplorerState
showLogin <- snd <$> R.useState' true
pure $
RH.div
{ id: "graph-explorer" }
[
row
[
outer
[ row
[ outer
[ inner
[ row1
[ col [ pullLeft [ Toggle.treeToggleButton controls.showTree ] ]
...
...
@@ -75,7 +77,7 @@ explorerCpt = R.hooksComponent "G.C.GraphExplorer.explorer" cpt
, col [ pullRight [ Toggle.sidebarToggleButton controls.showSidePanel ] ]
]
, row [ Controls.controls controls ]
, row [ tree {mCurrentRoute, treeId} controls
, row [ tree {mCurrentRoute, treeId} controls
showLogin
, mGraph controls.sigmaRef {graphId, graph}
, Sidebar.sidebar {showSidePanel: fst controls.showSidePanel} ]
, row [ ]
...
...
@@ -84,17 +86,17 @@ explorerCpt = R.hooksComponent "G.C.GraphExplorer.explorer" cpt
]
]
where
tree {treeId: Nothing}
_ = RH.div { id: "tree" } []
tree _ {showTree: false /\ _} = RH.div { id: "tree" } []
tree {mCurrentRoute: m, treeId:
Just root} _ =
RH.div {
id: "tree", className: "col-md-2"
}
[ Tree.treeView {frontends, root, mCurrentRoute: m, session: session}
]
-- tree {treeId: Nothing} _
_ = RH.div { id: "tree" } []
tree _ {showTree: false /\ _}
_
= RH.div { id: "tree" } []
tree {mCurrentRoute: m, treeId:
root} _ showLogin=
RH.div {
className: "col-md-2", style: {paddingTop: "60px"}
}
[forest {sessions: Sessions (Just session), route:m, frontends, showLogin}
]
outer = RH.div { className: "col-md-12" }
inner = RH.div { className: "container-fluid", style: { paddingTop: "90px" } }
row1 = RH.div { className: "row", style: { paddingBottom: "10px", marginTop: "-24px" } }
row = RH.div { className: "row" }
col = RH.div { className: "col-md-4" }
pullLeft = RH.div { className: "pull-left" }
row1
= RH.div { className: "row", style: { paddingBottom: "10px", marginTop: "-24px" } }
row
= RH.div { className: "row" }
col
= RH.div { className: "col-md-4" }
pullLeft
= RH.div { className: "pull-left" }
pullRight = RH.div { className: "pull-right" }
...
...
src/Gargantext/Components/GraphExplorer/Controls.purs
View file @
8e0b5f8d
...
...
@@ -29,12 +29,12 @@ import Gargantext.Utils.Reactix as R2
type Controls =
( cursorSize :: R.State Number
( cursorSize
:: R.State Number
, multiNodeSelect :: R.Ref Boolean
, showControls :: R.State Boolean
, showSidePanel :: R.State Boolean
, showTree :: R.State Boolean
, sigmaRef :: R.Ref (Maybe Sigmax.Sigma)
, showControls
:: R.State Boolean
, showSidePanel
:: R.State Boolean
, showTree
:: R.State Boolean
, sigmaRef
:: R.Ref (Maybe Sigmax.Sigma)
)
controlsToSigmaSettings :: Record Controls -> Record Graph.SigmaSettings
...
...
@@ -100,21 +100,20 @@ controlsCpt = R.hooksComponent "GraphControls" cpt
useGraphControls :: R.Hooks (Record Controls)
useGraphControls = do
cursorSize <- R.useState' 10.0
cursorSize
<- R.useState' 10.0
multiNodeSelect <- R.useRef false
showControls <- R.useState' false
showSidePanel <- R.useState' false
showControls
<- R.useState' false
showSidePanel
<- R.useState' false
showTree <- R.useState' false
sigmaRef <- R2.nothingRef
pure {
cursorSize
, multiNodeSelect
, showControls
, showSidePanel
, showTree
, sigmaRef
}
pure { cursorSize
, multiNodeSelect
, showControls
, showSidePanel
, showTree
, sigmaRef
}
getShowControls :: Record Controls -> Boolean
getShowControls { showControls: ( should /\ _ ) } = should
...
...
@@ -138,7 +137,7 @@ setShowSidePanel :: Record Controls -> Boolean -> Effect Unit
setShowSidePanel { showSidePanel: ( _ /\ set ) } v = set $ const v
setShowTree :: Record Controls -> Boolean -> Effect Unit
setShowTree { showTree: ( _ /\ set ) } v = set $ const v
setShowTree { showTree: ( _ /\ set ) } v = set $
not <<<
const v
setCursorSize :: Record Controls -> Number -> Effect Unit
setCursorSize { cursorSize: ( _ /\ setSize ) } v = setSize $ const v
...
...
src/Gargantext/Components/NgramsTable.purs
View file @
8e0b5f8d
...
...
@@ -80,12 +80,12 @@ data Action
type Dispatch = Action -> Effect Unit
tableContainer :: { pageParams :: PageParams
, dispatch :: Dispatch
, setPath :: R2.Setter PageParams
, ngramsParent :: Maybe NgramsTerm
tableContainer :: { pageParams
:: PageParams
, dispatch
:: Dispatch
, setPath
:: R2.Setter PageParams
, ngramsParent
:: Maybe NgramsTerm
, ngramsChildren :: Map NgramsTerm Boolean
, ngramsTable :: NgramsTable
, ngramsTable
:: NgramsTable
}
-> Record T.TableContainerProps -> R.Element
tableContainer { pageParams
...
...
@@ -185,10 +185,10 @@ useNgramsReducer :: State -> R.Hooks (R.Reducer State Action')
useNgramsReducer init = R.useReducer' performNgramsAction init
type Props =
( session :: Session
( session
:: Session
, tabNgramType :: CTabNgramType
, path :: R.State PageParams
, versioned :: VersionedNgramsTable )
, path
:: R.State PageParams
, versioned
:: VersionedNgramsTable )
ngramsTable :: Record Props -> R.Element
ngramsTable props = R.createElement ngramsTableCpt props []
...
...
src/Gargantext/Components/NgramsTable/Core.purs
View file @
8e0b5f8d
...
...
@@ -104,11 +104,11 @@ type CoreParams s =
type PageParams =
CoreParams
( params :: T.Params
, searchQuery :: String
( params
:: T.Params
, searchQuery
:: String
, termListFilter :: Maybe TermList -- Nothing means all
, termSizeFilter :: Maybe TermSize -- Nothing means all
, session :: Session
, session
:: Session
)
initialPageParams :: Session -> Int -> Array Int -> TabType -> PageParams
...
...
src/Gargantext/Components/RandomText.purs
View file @
8e0b5f8d
...
...
@@ -7,7 +7,7 @@ Maintainer : alexandre.delanoe@iscpif.fr
Stability : experimental
Portability : POSIX
How semantic emerge from contextualized randomness can be experimented
How semantic emerge
s
from contextualized randomness can be experimented
with these simple functions;
randomSentences: randomizes sentences in a paragraph.
...
...
src/Gargantext/Components/Tree.purs
View file @
8e0b5f8d
...
...
@@ -44,13 +44,17 @@ type Reload = Int
data NodePopup = CreatePopup | NodePopup
type Props = ( root :: ID, mCurrentRoute :: Maybe AppRoute, session :: Session, frontends :: Frontends )
type TreeViewProps =
( tree :: FTree
, mCurrentRoute :: Maybe AppRoute
, frontends :: Frontends
, session :: Session )
type Props = ( root :: ID
, mCurrentRoute :: Maybe AppRoute
, session :: Session
, frontends :: Frontends
)
type TreeViewProps = ( tree :: FTree
, mCurrentRoute :: Maybe AppRoute
, frontends :: Frontends
, session :: Session
)
data NTree a = NTree a (Array (NTree a))
...
...
@@ -203,7 +207,8 @@ type NodeMainSpanProps =
( id :: ID
, name :: Name
, nodeType :: NodeType
, mCurrentRoute :: Maybe AppRoute)
, mCurrentRoute :: Maybe AppRoute
)
nodeMainSpan :: (Action -> Aff Unit)
-> Record NodeMainSpanProps
...
...
@@ -216,9 +221,9 @@ nodeMainSpan d p folderOpen session frontends = R.createElement el p []
el = R.hooksComponent "NodeMainSpan" cpt
cpt {id, name, nodeType, mCurrentRoute} _ = do
-- only 1 popup at a time is allowed to be opened
popupOpen <- R.useState' (Nothing :: Maybe NodePopup)
popupOpen
<- R.useState' (Nothing :: Maybe NodePopup)
droppedFile <- R.useState' (Nothing :: Maybe DroppedFile)
isDragOver <- R.useState' false
isDragOver
<- R.useState' false
pure $ H.span (dropProps droppedFile isDragOver)
[ folderIcon folderOpen
...
...
@@ -270,10 +275,14 @@ nodeMainSpan d p folderOpen session frontends = R.createElement el p []
fldr :: Boolean -> String
fldr open = if open then "glyphicon glyphicon-folder-open" else "glyphicon glyphicon-folder-close"
childNodes :: Session -> Frontends -> R.State Reload -> R.State Boolean -> Maybe AppRoute -> Array FTree -> Array R.Element
fldr open = if open
then "glyphicon glyphicon-folder-open"
else "glyphicon glyphicon-folder-close"
childNodes :: Session -> Frontends
-> R.State Reload -> R.State Boolean
-> Maybe AppRoute -> Array FTree
-> Array R.Element
childNodes _ _ _ _ _ [] = []
childNodes _ _ _ (false /\ _) _ _ = []
childNodes session frontends reload (true /\ _) mCurrentRoute ary = map (\ctree -> childNode {tree: ctree}) ary
...
...
src/Gargantext/Config.purs
View file @
8e0b5f8d
...
...
@@ -5,21 +5,21 @@ import Gargantext.Ends
import Gargantext.Types (ApiVersion(..))
defaultBackends :: NonEmpty Array Backend
defaultBackends =
prod :| [dev, demo, local
]
defaultBackends =
local :| [dev, demo
]
where
prod = backend V10 "/api/" "https://gargantext.org" "gargantext.org"
--
prod = backend V10 "/api/" "https://gargantext.org" "gargantext.org"
dev = backend V10 "/api/" "https://dev.gargantext.org" "dev.gargantext.org"
demo = backend V10 "/api/" "https://demo.gargantext.org" "demo.gargantext.org"
local = backend V10 "/api/" "http://localhost:8008" "localhost"
defaultApps :: NonEmpty Array Frontend
defaultApps = relative :| [
prod,
dev, demo, haskell, caddy]
defaultApps = relative :| [dev, demo, haskell, caddy]
where
relative = frontend "/#/" "" "Relative"
prod = frontend "/#/" "https://gargantext.org" "gargantext.org"
--
prod = frontend "/#/" "https://gargantext.org" "gargantext.org"
dev = frontend "/#/" "https://dev.gargantext.org" "gargantext.org (dev)"
demo = frontend "/#/" "https://demo.gargantext.org" "gargantext.org (demo)"
haskell = frontend "/#/" "http://localhost:8008" "localhost.gargantext
)
"
haskell = frontend "/#/" "http://localhost:8008" "localhost.gargantext"
python = frontend "/#/" "http://localhost:8000" "localhost.python"
caddy = frontend "/#/" "http://localhost:2015" "localhost.caddy"
...
...
src/Gargantext/Ends.purs
View file @
8e0b5f8d
...
...
@@ -95,11 +95,11 @@ staticUrl :: Frontends -> String -> String
staticUrl (Frontends {static}) = frontendUrl static
sessionPath :: R.SessionRoute -> String
sessionPath (R.Tab t i) = sessionPath (R.NodeAPI Node i) <> "/" <> showTabType' t
sessionPath (R.Tab t i)
= sessionPath (R.NodeAPI Node i) <> "/" <> showTabType' t
sessionPath (R.Children n o l s i) = root <> "children?type=" <> show n <> offsetUrl o <> limitUrl l <> orderUrl s
where root = sessionPath (R.NodeAPI Node i) <> "/"
sessionPath (R.NodeAPI Phylo pId) = "phyloscape?nodeId=" <> (show $ maybe 0 identity pId)
sessionPath (R.GetNgrams opts i) =
sessionPath (R.NodeAPI Phylo pId)
= "phyloscape?nodeId=" <> (show $ maybe 0 identity pId)
sessionPath (R.GetNgrams opts i)
=
base opts.tabType
<> "/ngrams?ngramsType="
<> showTabType' opts.tabType
...
...
src/Gargantext/Hooks/Loader.purs
View file @
8e0b5f8d
...
...
@@ -10,7 +10,8 @@ import Reactix as R
import Gargantext.Utils.Reactix as R2
import Gargantext.Components.LoadingSpinner (loadingSpinner)
useAff :: forall st. Aff st -> R.Hooks (Maybe st)
useAff :: forall st.
Aff st -> R.Hooks (Maybe st)
useAff loader = do
(loaded /\ setLoaded) <- R.useState' Nothing
R.useEffect1 loader $ do
...
...
@@ -20,36 +21,44 @@ useAff loader = do
else pure R.nothing
pure loaded
useLoader :: forall path st. path -> (path -> Aff st) -> (st -> R.Element) -> R.Hooks R.Element
useLoader :: forall path st.
path -> (path -> Aff st) -> (st -> R.Element) -> R.Hooks R.Element
useLoader path loader render
= maybe' (\_ -> loadingSpinner {}) render
<$> (useAff =<< R.useMemo2 path loader (\_ -> loader path))
useLoader2 :: forall path st. R.State path -> (path -> Aff st) -> (st -> R.Element) -> R.Hooks R.Element
useLoader2 :: forall path st.
R.State path -> (path -> Aff st)
-> (st -> R.Element) -> R.Hooks R.Element
useLoader2 path loader render = do
state <- R.useState' Nothing
useLoaderEffect2 path state loader
pure $ maybe (loadingSpinner {}) render (fst state)
useLoaderEffect :: forall state. Aff state -> R.State (Maybe state) -> R.Hooks Unit
useLoaderEffect :: forall state.
Aff state -> R.State (Maybe state) -> R.Hooks Unit
useLoaderEffect loader (state /\ setState) = do
R.useEffect2 state loader $ do
if isNothing state then
R2.affEffect "G.H.Loader.useLoader" $ loader >>= (liftEffect <<< setState <<< const <<< Just)
else pure R.nothing
useLoaderEffect' :: forall state. Aff state -> R.Hooks (R.State (Maybe state))
useLoaderEffect' :: forall state.
Aff state -> R.Hooks (R.State (Maybe state))
useLoaderEffect' aff = do
state <- R.useState' Nothing
useLoaderEffect aff state
pure state
useLoaderEffect2 :: forall st path. R.State path -> R.State (Maybe st) -> (path -> Aff st) -> R.Hooks Unit
useLoaderEffect2 :: forall st path.
R.State path -> R.State (Maybe st)
-> (path -> Aff st) -> R.Hooks Unit
useLoaderEffect2 path state loader = do
aff <- useRepointer path loader
useLoaderEffect aff state
useRepointer :: forall path st. R.State path -> (path -> Aff st) -> R.Hooks (Aff st)
useRepointer :: forall path st.
R.State path -> (path -> Aff st) -> R.Hooks (Aff st)
useRepointer path@(path' /\ _) loader = R.useMemo2 loader path' (\_ -> loader path')
src/Gargantext/Pages/Annuaire.purs
View file @
8e0b5f8d
module Gargantext.Pages.Annuaire where
import Prelude (bind, const, identity, pure, ($), (<$>), (<>))
import Data.Argonaut (class DecodeJson, decodeJson, (.:), (.
?
?))
import Data.Argonaut (class DecodeJson, decodeJson, (.:), (.
:
?))
import Data.Array (head)
import Data.Maybe (Maybe(..), maybe)
import Data.Tuple (fst, snd)
...
...
@@ -29,7 +29,7 @@ toRows (AnnuaireTable a) = a.annuaireTable
-- | Top level layout component. Loads an annuaire by id and renders
-- | the annuaire using the result
type LayoutProps = (
annuair
eId :: Int, session :: Session )
type LayoutProps = (
nod
eId :: Int, session :: Session )
annuaireLayout :: Record LayoutProps -> R.Element
annuaireLayout props = R.createElement annuaireLayoutCpt props []
...
...
@@ -37,8 +37,8 @@ annuaireLayout props = R.createElement annuaireLayoutCpt props []
annuaireLayoutCpt :: R.Component LayoutProps
annuaireLayoutCpt = R.hooksComponent "G.P.Annuaire.annuaireLayout" cpt
where
cpt {
annuair
eId, session} _ = do
path <- R.useState'
annuair
eId
cpt {
nod
eId, session} _ = do
path <- R.useState'
nod
eId
useLoader (fst path) (getAnnuaireInfo session) $
\info -> annuaire {session, path, info}
...
...
@@ -138,8 +138,8 @@ data HyperdataAnnuaire = HyperdataAnnuaire
instance decodeHyperdataAnnuaire :: DecodeJson HyperdataAnnuaire where
decodeJson json = do
obj <- decodeJson json
title <- obj .
?
? "title"
desc <- obj .
?
? "desc"
title <- obj .
:
? "title"
desc <- obj .
:
? "desc"
pure $ HyperdataAnnuaire { title, desc }
------------------------------------------------------------------------------
...
...
src/Gargantext/Pages/Corpus/Document.purs
View file @
8e0b5f8d
module Gargantext.Pages.Corpus.Document where
import Prelude (class Show, bind, identity, mempty, pure, ($), (<<<))
import Data.Argonaut (class DecodeJson, decodeJson, (.:), (.
?
?))
import Data.Argonaut (class DecodeJson, decodeJson, (.:), (.
:
?))
import Data.Generic.Rep (class Generic)
import Data.Generic.Rep.Show (genericShow)
import Data.Maybe (Maybe(..), maybe)
...
...
@@ -203,7 +203,7 @@ instance decodeDocumentV3 :: DecodeJson DocumentV3
where
decodeJson json = do
obj <- decodeJson json
abstract <- obj .
?
? "abstract"
abstract <- obj .
:
? "abstract"
authors <- obj .: "authors"
--error <- obj .: "error"
language_iso2 <- obj .: "language_iso2"
...
...
@@ -243,23 +243,23 @@ instance decodeDocument :: DecodeJson Document
where
decodeJson json = do
obj <- decodeJson json
abstract <- obj .
?
? "abstract"
authors <- obj .
?
? "authors"
bdd <- obj .
?
? "bdd"
doi <- obj .
?
? "doi"
language_iso2 <- obj .
?
? "language_iso2"
-- page <- obj .
?
? "page"
publication_date <- obj .
?
? "publication_date"
--publication_second <- obj .
?
? "publication_second"
--publication_minute <- obj .
?
? "publication_minute"
--publication_hour <- obj .
?
? "publication_hour"
publication_day <- obj .
?
? "publication_day"
publication_month <- obj .
?
? "publication_month"
publication_year <- obj .
?
? "publication_year"
source <- obj .
?
? "sources"
institutes <- obj .
?
? "institutes"
title <- obj .
?
? "title"
uniqId <- obj .
?
? "uniqId"
abstract <- obj .
:
? "abstract"
authors <- obj .
:
? "authors"
bdd <- obj .
:
? "bdd"
doi <- obj .
:
? "doi"
language_iso2 <- obj .
:
? "language_iso2"
-- page <- obj .
:
? "page"
publication_date <- obj .
:
? "publication_date"
--publication_second <- obj .
:
? "publication_second"
--publication_minute <- obj .
:
? "publication_minute"
--publication_hour <- obj .
:
? "publication_hour"
publication_day <- obj .
:
? "publication_day"
publication_month <- obj .
:
? "publication_month"
publication_year <- obj .
:
? "publication_year"
source <- obj .
:
? "sources"
institutes <- obj .
:
? "institutes"
title <- obj .
:
? "title"
uniqId <- obj .
:
? "uniqId"
--url <- obj .: "url"
--text <- obj .: "text"
pure $ Document { abstract
...
...
src/Gargantext/Pages/Home.purs
View file @
8e0b5f8d
...
...
@@ -8,7 +8,8 @@ import Reactix.DOM.HTML as H
import Routing.Hash (setHash)
import Gargantext.Components.Lang.Landing.EnUS as En
import Gargantext.Components.Lang.Landing.FrFR as Fr
import Gargantext.Components.Data.Landing (BlockText(..), BlockTexts(..), Button(..), LandingData(..))
import Gargantext.Components.Data.Landing
(BlockText(..), BlockTexts(..), Button(..), LandingData(..))
import Gargantext.Components.Data.Lang (Lang(..))
type Props = ()
...
...
src/Gargantext/Pages/Lists.purs
View file @
8e0b5f8d
...
...
@@ -43,7 +43,7 @@ getCorpus :: Session -> Int -> Aff Tabs.CorpusData
getCorpus session listId = do
-- fetch corpus via lists parentId
(NodePoly {parentId: corpusId} :: NodePoly {}) <- get nodePolyUrl
corpusNode <- get $ corpusNodeUrl corpusId
corpusNode <- get $ corpusNodeUrl
corpusId
defaultListIds <- get $ defaultListIdsUrl corpusId
case (head defaultListIds :: Maybe (NodePoly HyperdataList)) of
Just (NodePoly { id: defaultListId }) ->
...
...
@@ -51,6 +51,6 @@ getCorpus session listId = do
Nothing ->
throwError $ error "Missing default list"
where
nodePolyUrl = url session (NodeAPI Corpus (Just listId))
corpusNodeUrl = url session <<< NodeAPI Corpus <<< Just
nodePolyUrl
= url session (NodeAPI Corpus (Just listId))
corpusNodeUrl
= url session <<< NodeAPI Corpus <<< Just
defaultListIdsUrl = url session <<< Children NodeList 0 1 Nothing <<< Just
src/Gargantext/Pages/Texts.purs
View file @
8e0b5f8d
...
...
@@ -30,7 +30,7 @@ textsLayout props = R.createElement textsLayoutCpt props []
textsLayoutCpt :: R.Component Props
textsLayoutCpt = R.hooksComponent "TextsLoader" cpt
where
cpt {
nodeId,session
} _ =
cpt {
session,nodeId
} _ =
useLoader nodeId (getCorpus session) $
\corpusData@{corpusId, corpusNode, defaultListId} ->
let
...
...
src/Gargantext/Router.purs
View file @
8e0b5f8d
...
...
@@ -9,18 +9,21 @@ import Gargantext.Routes (AppRoute(..))
router :: Match AppRoute
router = oneOf
[ Login <$ route "login"
, Folder <$> (route "folder" *> int)
, CorpusDocument <$> (route "corpus" *> int) <*> (lit "list" *> int) <*> (lit "document" *> int)
, Corpus <$> (route "corpus" *> int)
, Document <$> (route "list" *> int) <*> (lit "document" *> int)
, Dashboard <$ route "dashboard"
, PGraphExplorer <$> (route "graph" *> int)
, Texts <$> (route "texts" *> int)
, Lists <$> (route "lists" *> int)
, Annuaire <$> (route "annuaire" *> int)
, UserPage <$> (route "user" *> int)
, ContactPage <$> (route "contact" *> int)
, Home <$ lit ""
, Folder <$> (route "folder" *> int)
, CorpusDocument <$> (route "corpus" *> int)
<*> (lit "list" *> int)
<*> (lit "document" *> int)
, Corpus <$> (route "corpus" *> int)
, Document <$> (route "list" *> int)
<*> (lit "document" *> int)
, Dashboard <$> (route "dashboard" *> int)
, PGraphExplorer <$> (route "graph" *> int)
, Texts <$> (route "texts" *> int)
, Lists <$> (route "lists" *> int)
, Annuaire <$> (route "annuaire" *> int)
, UserPage <$> (route "user" *> int)
, ContactPage <$> (route "contact" *> int)
, Home <$ lit ""
]
where
route str = lit "" *> lit str
...
...
src/Gargantext/Routes.purs
View file @
8e0b5f8d
...
...
@@ -12,7 +12,7 @@ data AppRoute
| Document Int Int
| CorpusDocument Int Int Int
| PGraphExplorer Int
| Dashboard
| Dashboard
Int
| Texts Int
| Lists Int
| Annuaire Int
...
...
@@ -32,31 +32,31 @@ data SessionRoute
| Chart ChartOpts (Maybe Id)
instance showAppRoute :: Show AppRoute where
show Home = "Home"
show Login = "Login"
show (Folder
i)
= "Folder" <> show i
show (Corpus i) = "Corpus" <> show i
show Home
= "Home"
show Login
= "Login"
show (Folder
i)
= "Folder" <> show i
show (Corpus i)
= "Corpus" <> show i
show (Document _ i) = "Document" <> show i
show (CorpusDocument _ _ i) = "Document" <> show i
show (PGraphExplorer i) = "graphExplorer" <> show i
show
Dashboard = "Dashboard"
show
(Dashboard i) = "Dashboard" <> show i
show (Texts i) = "texts" <> show i
show (Lists i) = "lists" <> show i
show (Annuaire i) = "Annuaire" <> show i
show (UserPage i) = "User" <> show i
show (ContactPage i) = "Contact" <> show i
show (Annuaire i)
= "Annuaire" <> show i
show (UserPage i)
= "User" <> show i
show (ContactPage i)
= "Contact" <> show i
appPath :: AppRoute -> String
appPath Home = ""
appPath Login = "login"
appPath Home
= ""
appPath Login
= "login"
appPath (Folder i) = "folder/" <> show i
appPath (CorpusDocument c l i) = "corpus/" <> show c <> "/list/" <> show l <> "/document/" <> show i
appPath (Corpus i) = "corpus/" <> show i
appPath (Document l i) = "list/" <> show l <> "/document/" <> show i
appPath
Dashboard = "dashboard"
appPath (Corpus i)
= "corpus/" <> show i
appPath (Document l i)
= "list/" <> show l <> "/document/" <> show i
appPath
(Dashboard i) = "dashboard/" <> show i
appPath (PGraphExplorer i) = "graph/" <> show i
appPath (Texts i) = "texts/" <> show i
appPath (Lists i) = "lists/" <> show i
appPath (Texts i)
= "texts/" <> show i
appPath (Lists i)
= "lists/" <> show i
appPath (Annuaire i) = "annuaire/" <> show i
appPath (UserPage i) = "user/" <> show i
appPath (ContactPage i) = "contact/" <> show i
src/Gargantext/Sessions.purs
View file @
8e0b5f8d
...
...
@@ -68,8 +68,8 @@ act :: Sessions -> Action -> Effect Sessions
act _ (Login session) = pure $ Sessions (Just session)
act (Sessions s) (Logout session)
| Just session == s = pure (Sessions Nothing)
| Just s2 <- s = log2 "Alien session:" s2 *> pure (Sessions Nothing)
| otherwise = log "Can't log out of nonexistent session" *> pure (Sessions Nothing)
| Just
s2 <- s = log2 "Alien session:" s2 *> pure (Sessions Nothing)
| otherwise
= log "Can't log out of nonexistent session" *> pure (Sessions Nothing)
-- Key we will store the data under
localStorageKey :: String
...
...
@@ -106,7 +106,7 @@ postAuthRequest backend ar@(AuthRequest {username}) =
decode <$> post (toUrl backend "auth") ar
where
decode (AuthResponse ar2)
| {inval: Just (AuthInvalid {message})} <- ar2 = Left message
| {inval: Just (AuthInvalid {message})}
<- ar2 = Left message
| {valid: Just (AuthData {token, tree_id})} <- ar2 =
Right $ Session { backend, username, token, treeId: tree_id }
| otherwise = Left "Invalid response from server"
test/Gargantext/Components/NgramsTable/Spec.purs
View file @
8e0b5f8d
module Gargantext.Components.NgramsTable.Spec where
import Prelude
import Gargantext.Config (CTabNgramType(..))
import Data.Maybe (Maybe(..))
import Data.Tuple (Tuple(..))
import Gargantext.Components.NgramsTable.Core (highlightNgrams, NgramsElement(..), NgramsTable(..))
import Gargantext.Config (CTabNgramType(..))
import Gargantext.Types (TermList(..))
import Test.Spec (Spec, describe, it)
import Test.Spec.Assertions (shouldEqual)
...
...
@@ -13,6 +11,7 @@ import Test.Spec.Assertions (shouldEqual)
import Data.Map as Map
import Data.Set as Set
{-
spec :: Spec Unit
spec = do
let ne ngrams list =
...
...
@@ -93,3 +92,4 @@ spec = do
,Tuple ", after" Nothing
]
highlightNgrams CTabTerms table input `shouldEqual` output
-}
Write
Preview