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
149
Issues
149
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
5be8647d
Commit
5be8647d
authored
Mar 04, 2022
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into 90-dev-wos-zip-parser
parents
9e045c1d
57cb9f70
Pipeline
#2538
failed with stage
in 0 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
24 deletions
+21
-24
package.json
package.json
+1
-1
Node.purs
src/Gargantext/Components/Forest/Tree/Node.purs
+15
-12
Tools.purs
src/Gargantext/Components/Forest/Tree/Node/Tools.purs
+2
-2
ProgressBar.purs
...antext/Components/Forest/Tree/Node/Tools/ProgressBar.purs
+3
-9
No files found.
package.json
View file @
5be8647d
{
"name"
:
"Gargantext"
,
"version"
:
"0.0.5.6.
3
"
,
"version"
:
"0.0.5.6.
6
"
,
"scripts"
:
{
"generate-purs-packages-nix"
:
"./nix/generate-purs-packages.nix"
,
"generate-psc-packages-nix"
:
"./nix/generate-packages-json.bash"
,
...
...
src/Gargantext/Components/Forest/Tree/Node.purs
View file @
5be8647d
...
...
@@ -125,17 +125,6 @@ nodeMainSpanCpt = here.component "nodeMainSpan" cpt
, session } []
, fileTypeView { dispatch, droppedFile, id, isDragOver, nodeType } []
, H.div {} (map (\t -> asyncProgressBar { asyncTask: t
, barType: Pie
, errors
, nodeId: id
, onFinish: onTaskFinish id t
, session } []
) currentTasks'
)
, if nodeType == GT.NodeUser
then GV.versionView { session } []
else H.div {} []
, if showBox then
Popover.popover { arrow: false
...
...
@@ -146,7 +135,21 @@ nodeMainSpanCpt = here.component "nodeMainSpan" cpt
popOverIcon
, mNodePopupView props (onPopoverClose popoverRef)
]
else H.div {} []
else H.div {} []
, H.div { style: { width: "8em" } }
(map (\t -> asyncProgressBar { asyncTask: t
--, barType: Pie
, barType: Bar
, errors
, nodeId: id
, onFinish: onTaskFinish id t
, session } []
) currentTasks'
)
, if nodeType == GT.NodeUser
then GV.versionView { session } []
else H.div {} []
, nodeActions { id
, nodeType
...
...
src/Gargantext/Components/Forest/Tree/Node/Tools.purs
View file @
5be8647d
...
...
@@ -290,9 +290,9 @@ nodeLinkCpt = here.component "nodeLink" cpt
pure $
H.div { className: "node-link"
, on: { click } }
[ H.a { href, data: { for:
tooltipId id
, tip: true } }
[ H.a { href, data: { for:
name <> "-" <> (tooltipId id)
, tip: true } }
[ nodeText { isSelected, name }
, ReactTooltip.reactTooltip { effect: "float", id:
tooltipId id
, type: "dark" }
, ReactTooltip.reactTooltip { effect: "float", id:
name <> "-" <> (tooltipId id)
, type: "dark" }
[ R2.row
[ H.h4 {className: GT.fldr nodeType true}
[ H.text $ GT.prettyNodeType nodeType ]
...
...
src/Gargantext/Components/Forest/Tree/Node/Tools/ProgressBar.purs
View file @
5be8647d
...
...
@@ -2,7 +2,7 @@ module Gargantext.Components.Forest.Tree.Node.Tools.ProgressBar where
import Gargantext.Prelude
import Data.Int (f
romNumbe
r)
import Data.Int (f
loo
r)
import Data.Maybe (Maybe(..))
import Effect (Effect)
import Effect.Aff (launchAff_)
...
...
@@ -79,13 +79,12 @@ type ProgressIndicatorProps =
progressIndicator :: Record ProgressIndicatorProps -> R.Element
progressIndicator p = R.createElement progressIndicatorCpt p []
progressIndicatorCpt :: R.Component ProgressIndicatorProps
progressIndicatorCpt = here.component "progressIndicator" cpt
where
cpt { barType, label, progress } _ = do
progress' <- T.useLive T.unequal progress
let progressInt =
toInt
progress'
let progressInt =
floor
progress'
case barType of
Bar -> pure $
...
...
@@ -93,7 +92,7 @@ progressIndicatorCpt = here.component "progressIndicator" cpt
[ H.div { className: "progress-bar"
, role: "progressbar"
, style: { width: (show $ progressInt) <> "%" }
} [
H.text label
]
} [ ]
]
Pie -> pure $
H.div { className: "progress-pie" }
...
...
@@ -103,11 +102,6 @@ progressIndicatorCpt = here.component "progressIndicator" cpt
]
]
toInt :: Number -> Int
toInt n = case fromNumber n of
Nothing -> 0
Just x -> x
queryProgress :: Record Props -> AffRESTError GT.AsyncProgress
queryProgress { asyncTask: GT.AsyncTaskWithType { task: GT.AsyncTask {id}
, typ
...
...
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