Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
150
Issues
150
List
Board
Labels
Milestones
Merge Requests
5
Merge Requests
5
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
haskell-gargantext
Commits
27465e28
Commit
27465e28
authored
Feb 05, 2020
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Node] add "charts" in JSONField
This is to save charts in dashboard.
parent
6d58acdd
Pipeline
#726
failed with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
4 deletions
+18
-4
Node.hs
src/Gargantext/Database/Types/Node.hs
+17
-3
Utils.hs
src/Gargantext/Database/Utils.hs
+1
-1
No files found.
src/Gargantext/Database/Types/Node.hs
View file @
27465e28
...
...
@@ -301,6 +301,18 @@ instance Hyperdata HyperdataUser
------------------------------------------------------------------------
------------------------------------------------------------------------
------------------------------------------------------------------------
data
Chart
=
CDocsHistogram
|
CAuthorsPie
|
CInstitutesTree
|
CTermsMetrics
deriving
(
Generic
,
Show
,
Eq
)
instance
ToJSON
Chart
instance
FromJSON
Chart
instance
ToSchema
Chart
data
CodeType
=
JSON
|
Markdown
|
Haskell
deriving
(
Generic
)
instance
ToJSON
CodeType
...
...
@@ -313,6 +325,7 @@ data CorpusField = MarkdownField { _cf_text :: !Text }
,
_cf_desc
::
!
Text
,
_cf_query
::
!
Text
,
_cf_authors
::
!
Text
,
_cf_charts
::
!
[
Chart
]
-- , _cf_resources :: ![Resource]
}
|
HaskellField
{
_cf_haskell
::
!
Text
}
...
...
@@ -361,9 +374,10 @@ corpusExample :: ByteString
corpusExample
=
""
-- TODO
defaultCorpus
::
HyperdataCorpus
defaultCorpus
=
HyperdataCorpus
[
HyperdataField
JSON
"Mandatory fields"
(
JsonField
"Title"
"Descr"
"Bool query"
"Authors"
)
,
HyperdataField
Markdown
"Optional Text"
(
MarkdownField
"# title
\n
## subtitle"
)
]
defaultCorpus
=
HyperdataCorpus
[
HyperdataField
JSON
"Mandatory fields"
(
JsonField
"Title"
"Descr"
"Bool query"
"Authors"
[]
)
,
HyperdataField
Markdown
"Optional Text"
(
MarkdownField
"# title
\n
## subtitle"
)
]
hyperdataCorpus
::
HyperdataCorpus
hyperdataCorpus
=
case
decode
corpusExample
of
...
...
src/Gargantext/Database/Utils.hs
View file @
27465e28
...
...
@@ -144,7 +144,7 @@ fromField' field mb = do
where
valueToHyperdata
v
=
case
fromJSON
v
of
Success
a
->
pure
a
Error
_err
->
returnError
ConversionFailed
field
"cannot parse hyperdata"
Error
_err
->
returnError
ConversionFailed
field
$
DL
.
intercalate
" "
[
"cannot parse hyperdata for JSON: "
,
show
v
]
printSqlOpa
::
Default
Unpackspec
a
a
=>
Query
a
->
IO
()
printSqlOpa
=
putStrLn
.
maybe
"Empty query"
identity
.
showSqlForPostgres
...
...
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