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
0
Merge Requests
0
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
Grégoire Locqueville
purescript-gargantext
Commits
9ad574b2
Commit
9ad574b2
authored
Feb 08, 2021
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[graph explorer] move search to top bar
parent
1de56035
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
9 deletions
+10
-9
sass.css
dist/styles/sass.css
+1
-1
GraphExplorer.purs
src/Gargantext/Components/GraphExplorer.purs
+4
-0
Controls.purs
src/Gargantext/Components/GraphExplorer/Controls.purs
+1
-5
Search.purs
src/Gargantext/Components/GraphExplorer/Search.purs
+3
-2
_graph.sass
src/sass/_graph.sass
+1
-1
No files found.
dist/styles/sass.css
View file @
9ad574b2
...
@@ -168,7 +168,7 @@
...
@@ -168,7 +168,7 @@
max-height
:
300px
;
max-height
:
300px
;
overflow-y
:
scroll
;
overflow-y
:
scroll
;
width
:
300px
;
width
:
300px
;
top
:
10
0px
;
top
:
5
0px
;
}
}
#dafixedtop
{
#dafixedtop
{
...
...
src/Gargantext/Components/GraphExplorer.purs
View file @
9ad574b2
...
@@ -24,6 +24,7 @@ import Gargantext.AsyncTasks as GAT
...
@@ -24,6 +24,7 @@ import Gargantext.AsyncTasks as GAT
import Gargantext.Components.Forest (forest)
import Gargantext.Components.Forest (forest)
import Gargantext.Components.Graph as Graph
import Gargantext.Components.Graph as Graph
import Gargantext.Components.GraphExplorer.Controls as Controls
import Gargantext.Components.GraphExplorer.Controls as Controls
import Gargantext.Components.GraphExplorer.Search (nodeSearchControl)
import Gargantext.Components.GraphExplorer.Sidebar as Sidebar
import Gargantext.Components.GraphExplorer.Sidebar as Sidebar
import Gargantext.Components.GraphExplorer.ToggleButton as Toggle
import Gargantext.Components.GraphExplorer.ToggleButton as Toggle
import Gargantext.Components.GraphExplorer.Types as GET
import Gargantext.Components.GraphExplorer.Types as GET
...
@@ -154,6 +155,9 @@ explorerCpt = R.hooksComponentWithModule thisModule "explorer" cpt
...
@@ -154,6 +155,9 @@ explorerCpt = R.hooksComponentWithModule thisModule "explorer" cpt
[ rowToggle
[ rowToggle
[ col [ spaces [ Toggle.treeToggleButton controls.showTree ]]
[ col [ spaces [ Toggle.treeToggleButton controls.showTree ]]
, col [ spaces [ Toggle.controlsToggleButton controls.showControls ]]
, col [ spaces [ Toggle.controlsToggleButton controls.showControls ]]
, col [ spaces [ nodeSearchControl { graph
, multiSelectEnabled: controls.multiSelectEnabled
, selectedNodeIds: controls.selectedNodeIds } [] ] ]
, col [ spaces [ Toggle.sidebarToggleButton controls.showSidePanel ]]
, col [ spaces [ Toggle.sidebarToggleButton controls.showSidePanel ]]
]
]
]
]
...
...
src/Gargantext/Components/GraphExplorer/Controls.purs
View file @
9ad574b2
...
@@ -23,7 +23,6 @@ import Reactix.DOM.HTML as RH
...
@@ -23,7 +23,6 @@ import Reactix.DOM.HTML as RH
import Gargantext.Components.Graph as Graph
import Gargantext.Components.Graph as Graph
import Gargantext.Components.GraphExplorer.Button (centerButton, cameraButton)
import Gargantext.Components.GraphExplorer.Button (centerButton, cameraButton)
import Gargantext.Components.GraphExplorer.RangeControl (edgeConfluenceControl, edgeWeightControl, nodeSizeControl)
import Gargantext.Components.GraphExplorer.RangeControl (edgeConfluenceControl, edgeWeightControl, nodeSizeControl)
import Gargantext.Components.GraphExplorer.Search (nodeSearchControl)
import Gargantext.Components.GraphExplorer.SlideButton (labelSizeButton, mouseSelectorSizeButton)
import Gargantext.Components.GraphExplorer.SlideButton (labelSizeButton, mouseSelectorSizeButton)
import Gargantext.Components.GraphExplorer.ToggleButton (multiSelectEnabledButton, edgesToggleButton, louvainToggleButton, pauseForceAtlasButton)
import Gargantext.Components.GraphExplorer.ToggleButton (multiSelectEnabledButton, edgesToggleButton, louvainToggleButton, pauseForceAtlasButton)
import Gargantext.Components.GraphExplorer.Types as GET
import Gargantext.Components.GraphExplorer.Types as GET
...
@@ -31,8 +30,8 @@ import Gargantext.Hooks.Sigmax as Sigmax
...
@@ -31,8 +30,8 @@ import Gargantext.Hooks.Sigmax as Sigmax
import Gargantext.Hooks.Sigmax.Types as SigmaxT
import Gargantext.Hooks.Sigmax.Types as SigmaxT
import Gargantext.Sessions (Session)
import Gargantext.Sessions (Session)
import Gargantext.Utils.Range as Range
import Gargantext.Utils.Range as Range
import Gargantext.Utils.Reactix as R2
thisModule :: String
thisModule = "Gargantext.Components.GraphExplorer.Controls"
thisModule = "Gargantext.Components.GraphExplorer.Controls"
type Controls =
type Controls =
...
@@ -160,9 +159,6 @@ controlsCpt = R.hooksComponentWithModule thisModule "controls" cpt
...
@@ -160,9 +159,6 @@ controlsCpt = R.hooksComponentWithModule thisModule "controls" cpt
-- zoom: 0 -100 - calculate ratio
-- zoom: 0 -100 - calculate ratio
, RH.li { className: "nav-item" } [ multiSelectEnabledButton props.multiSelectEnabled ] -- toggle multi node selection
, RH.li { className: "nav-item" } [ multiSelectEnabledButton props.multiSelectEnabled ] -- toggle multi node selection
-- save button
-- save button
, RH.li { className: "nav-item" } [ nodeSearchControl { graph: props.graph
, multiSelectEnabled: props.multiSelectEnabled
, selectedNodeIds: props.selectedNodeIds } ]
, RH.li { className: "nav-item" } [ mouseSelectorSizeButton props.sigmaRef localControls.mouseSelectorSize ]
, RH.li { className: "nav-item" } [ mouseSelectorSizeButton props.sigmaRef localControls.mouseSelectorSize ]
, RH.li { className: "nav-item" } [ cameraButton { id: props.graphId
, RH.li { className: "nav-item" } [ cameraButton { id: props.graphId
, hyperdataGraph: props.hyperdataGraph
, hyperdataGraph: props.hyperdataGraph
...
...
src/Gargantext/Components/GraphExplorer/Search.purs
View file @
9ad574b2
...
@@ -17,6 +17,7 @@ import Gargantext.Hooks.Sigmax.Types as SigmaxT
...
@@ -17,6 +17,7 @@ import Gargantext.Hooks.Sigmax.Types as SigmaxT
import Gargantext.Utils (queryMatchesLabel)
import Gargantext.Utils (queryMatchesLabel)
import Gargantext.Utils.Reactix as R2
import Gargantext.Utils.Reactix as R2
thisModule :: String
thisModule = "Gargantext.Components.GraphExplorer.Search"
thisModule = "Gargantext.Components.GraphExplorer.Search"
type Props = (
type Props = (
...
@@ -33,8 +34,8 @@ searchNodes :: String -> Seq.Seq (Record SigmaxT.Node) -> Seq.Seq (Record Sigmax
...
@@ -33,8 +34,8 @@ searchNodes :: String -> Seq.Seq (Record SigmaxT.Node) -> Seq.Seq (Record Sigmax
searchNodes "" _ = Seq.empty
searchNodes "" _ = Seq.empty
searchNodes s nodes = Seq.filter (nodeMatchesSearch s) nodes
searchNodes s nodes = Seq.filter (nodeMatchesSearch s) nodes
nodeSearchControl :: R
ecord Props -> R.Element
nodeSearchControl :: R
2.Component Props
nodeSearchControl
props = R.createElement sizeButtonCpt props []
nodeSearchControl
= R.createElement sizeButtonCpt
sizeButtonCpt :: R.Component Props
sizeButtonCpt :: R.Component Props
sizeButtonCpt = R.hooksComponentWithModule thisModule "nodeSearchControl" cpt
sizeButtonCpt = R.hooksComponentWithModule thisModule "nodeSearchControl" cpt
...
...
src/sass/_graph.sass
View file @
9ad574b2
...
@@ -82,4 +82,4 @@
...
@@ -82,4 +82,4 @@
max-height
:
300px
max-height
:
300px
overflow-y
:
scroll
overflow-y
:
scroll
width
:
300px
width
:
300px
top
:
10
0px
top
:
5
0px
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