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
142
Issues
142
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
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
4cab26ba
Commit
4cab26ba
authored
5 years ago
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into dev-warnings-cleanup
parents
62743a0e
1b88dd0f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
18 deletions
+35
-18
GraphExplorer.purs
src/Gargantext/Components/GraphExplorer.purs
+1
-1
Sidebar.purs
src/Gargantext/Components/GraphExplorer/Sidebar.purs
+11
-13
Config.purs
src/Gargantext/Config.purs
+1
-1
Array.purs
src/Gargantext/Data/Array.purs
+22
-3
No files found.
src/Gargantext/Components/GraphExplorer.purs
View file @
4cab26ba
...
@@ -12,7 +12,7 @@ import Data.Sequence as Seq
...
@@ -12,7 +12,7 @@ import Data.Sequence as Seq
import Data.Set as Set
import Data.Set as Set
import Data.Tuple (fst, snd, Tuple(..))
import Data.Tuple (fst, snd, Tuple(..))
import Data.Tuple.Nested ((/\))
import Data.Tuple.Nested ((/\))
import DOM.Simple.Console (log2)
--
import DOM.Simple.Console (log2)
import DOM.Simple.Types (Element)
import DOM.Simple.Types (Element)
import Effect.Aff (Aff)
import Effect.Aff (Aff)
import Reactix as R
import Reactix as R
...
...
This diff is collapsed.
Click to expand it.
src/Gargantext/Components/GraphExplorer/Sidebar.purs
View file @
4cab26ba
...
@@ -11,6 +11,7 @@ import Data.Tuple.Nested((/\))
...
@@ -11,6 +11,7 @@ import Data.Tuple.Nested((/\))
import Reactix as R
import Reactix as R
import Reactix.DOM.HTML as RH
import Reactix.DOM.HTML as RH
import Gargantext.Data.Array (catMaybes)
import Gargantext.Components.RandomText (words)
import Gargantext.Components.RandomText (words)
import Gargantext.Components.Nodes.Corpus.Graph.Tabs as GT
import Gargantext.Components.Nodes.Corpus.Graph.Tabs as GT
import Gargantext.Components.Graph as Graph
import Gargantext.Components.Graph as Graph
...
@@ -54,11 +55,11 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
...
@@ -54,11 +55,11 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
, href: "#home"
, href: "#home"
, role: "tab"
, role: "tab"
, aria: {controls: "home", selected: "true"}}
, aria: {controls: "home", selected: "true"}}
[ RH.text "
Neighbour
s" ] ] ]
[ RH.text "
Selected node
s" ] ] ]
, RH.div { className: "tab-content", id: "myTabContent" }
, RH.div { className: "tab-content", id: "myTabContent" }
[ RH.div { className: "", id: "home", role: "tabpanel" }
[ RH.div { className: "", id: "home", role: "tabpanel" }
(badge <$> badges) ] ]
(badge <$> badges
props.selectedNodeIds nodesMap
) ] ]
, RH.div { className: "col-md-12", id: "horizontal-checkbox" }
{-
, RH.div { className: "col-md-12", id: "horizontal-checkbox" }
[ RH.ul {}
[ RH.ul {}
[ checkbox "Pubs"
[ checkbox "Pubs"
, checkbox "Projects"
, checkbox "Projects"
...
@@ -66,6 +67,7 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
...
@@ -66,6 +67,7 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
, checkbox "Others"
, checkbox "Others"
]
]
]
]
-}
, RH.div { className: "col-md-12", id: "query" }
, RH.div { className: "col-md-12", id: "query" }
[
[
query props.frontends props.metaData props.session nodesMap props.selectedNodeIds
query props.frontends props.metaData props.session nodesMap props.selectedNodeIds
...
@@ -82,16 +84,10 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
...
@@ -82,16 +84,10 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
, className: "checkbox"
, className: "checkbox"
, checked: true
, checked: true
, title: "Mark as completed" } ]
, title: "Mark as completed" } ]
badges =
badges (selectedNodeIds /\ _) nodesMap = map (\n -> n.label)
[ "objects"
$ catMaybes
, "evaluation"
$ map (\n -> Map.lookup n nodesMap)
, "dynamics"
$ Set.toUnfoldable selectedNodeIds
, "virtual environments"
, "virtual reality"
, "performance analysis"
, "software engineering"
, "complex systems"
, "wireless communications" ]
query _ _ _ _ (selectedNodeIds /\ _) | Set.isEmpty selectedNodeIds = RH.div {} []
query _ _ _ _ (selectedNodeIds /\ _) | Set.isEmpty selectedNodeIds = RH.div {} []
query frontends (GET.MetaData metaData) session nodesMap (selectedNodeIds /\ _) =
query frontends (GET.MetaData metaData) session nodesMap (selectedNodeIds /\ _) =
...
@@ -108,3 +104,5 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
...
@@ -108,3 +104,5 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
, listId: metaData.listId
, listId: metaData.listId
, corpusLabel: metaData.title
, corpusLabel: metaData.title
}
}
This diff is collapsed.
Click to expand it.
src/Gargantext/Config.purs
View file @
4cab26ba
...
@@ -8,7 +8,7 @@ defaultBackends :: NonEmpty Array Backend
...
@@ -8,7 +8,7 @@ defaultBackends :: NonEmpty Array Backend
defaultBackends = local :| [prod, partner, demo, dev]
defaultBackends = local :| [prod, partner, demo, dev]
where
where
prod = backend V10 "/api/" "https://v4.gargantext.org" "iscpif.cnrs"
prod = backend V10 "/api/" "https://v4.gargantext.org" "iscpif.cnrs"
partner = backend V10 "/api/" "https://de
mo
.gargantext.org" "institut-mines-telecom.imt"
partner = backend V10 "/api/" "https://de
v
.gargantext.org" "institut-mines-telecom.imt"
demo = backend V10 "/api/" "https://demo.gargantext.org" "demo.inshs.cnrs"
demo = backend V10 "/api/" "https://demo.gargantext.org" "demo.inshs.cnrs"
dev = backend V10 "/api/" "https://dev.gargantext.org" "devel.inshs.cnrs"
dev = backend V10 "/api/" "https://dev.gargantext.org" "devel.inshs.cnrs"
local = backend V10 "/api/" "http://localhost:8008" "local.cnrs"
local = backend V10 "/api/" "http://localhost:8008" "local.cnrs"
...
...
This diff is collapsed.
Click to expand it.
src/Gargantext/Data/Array.purs
View file @
4cab26ba
module Gargantext.Data.Array
module Gargantext.Data.Array
where
where
import Data.Tuple (Tuple(..))
import Data.Array as DA
import Data.Array as DA
import Data.Maybe
import Data.Sequence as DS
import Data.Sequence as DS
import Data.Tuple (Tuple(..))
import Prelude (bind, flip, identity, (<<<))
----------------------------------------------------------------------
-- | Split arrays tools
splitEvery :: forall a. Int -> Array a -> Array (Array a)
splitEvery :: forall a. Int -> Array a -> Array (Array a)
splitEvery _ [] = []
splitEvery _ [] = []
splitEvery n xs =
splitEvery n xs =
...
@@ -18,3 +20,20 @@ splitAt n ls = Tuple (DS.toUnfoldable x) (DS.toUnfoldable xs)
...
@@ -18,3 +20,20 @@ splitAt n ls = Tuple (DS.toUnfoldable x) (DS.toUnfoldable xs)
where
where
Tuple x xs = DS.splitAt n (DS.fromFoldable ls)
Tuple x xs = DS.splitAt n (DS.fromFoldable ls)
----------------------------------------------------------------------
-- | Array with Maybe tools
mapMaybe :: forall a b. (a -> Maybe b) -> Array a -> Array b
mapMaybe f = concatMap (maybe [] singleton <<< f)
catMaybes :: forall a. Array (Maybe a) -> Array a
catMaybes = mapMaybe identity
----------------------------------------------------------------------
-- | Array misc tools
concatMap :: forall a b. (a -> Array b) -> Array a -> Array b
concatMap = flip bind
singleton :: forall a. a -> Array a
singleton a = [a]
This diff is collapsed.
Click to expand it.
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