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
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
Julien Moutinho
haskell-gargantext
Commits
3774aa22
Commit
3774aa22
authored
5 years ago
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[GRAPH] Type graph version is list version.
parent
e6298f58
dev
102-dev-graph-refresh
104-dev-john-snow-nlp
106-dev-ngrams-score-fix
111-dev-refactor-text-corpus-api-with-conduit
111-dev-refactor-text-corpus-api-with-conduit-alp
117-dev-gql-tree-parent-resolver
118-dev-gql-security
118-dev-gql-security-fix
119-dev-hal-notebook
121-dev-arxiv
124-dev-corpus-export-csv
131-dev-ngrams-table-db-connection
131-dev-ngrams-table-db-connection-2
141-dev-node-stories-db-optimization
143-dev-ngrams-repo-conflicts
144-NgramsTable_Optim
145-dev-graph-explorer-search-tfidf
145-graphExplorerSearch
149-dev-ngrams-table-sorting-fix
151-dev-pubmed-api-key
155-dev-export-list-as-csv
158-dev-ngrams-table-patch-sync
159-dev-node-story-versions-fix
161-dev-conduit-insert-db-fix
162-dev-ghc-9.4
162-dev-ghc-9.x
162-dev-haskell-9.2
163-dev-patch-fix
164-dev-node-write-analysis
175-dev-doc-table-count
175-dev-doc-table-count-temp
177-welcome-door-to-enter-the-project
184-dev-add-nlp-to-gargantext-ini
184-dev-add-support-for-multiple-languages-in-ini-file
186-dev-ngrams-score-fixes
190-dev-framecalc-async-fix
191-dev-list-upload-fixes
193-dev-api-query-dev-fix
199-dev-materialized-view-refresh-issue
201-dev-user-pubmed-api-key
203-dev-corpus-json-import
205-dev-ethercalc-codimd-doc-upload
206-dev-phylo
213-dev-implement-json-errors
217-dev-ngrams-patch
233-dev-terms-dates
234-dev-doc-table-score
239-readme-test-reinstall-project-with-cabal-and-update-the-readme-file
239-readme-test-reinstall-project-with-cabal-and-update-the-readme-file-2
244-dev-cabal-dependencies-versions
244-dev-hal-language-fix-for-abstracts
244-dev-stack2cabal
250-dev-fix-corpus-hyperdata-update
259-dev-security-fixes
260-readme-add-note-about-libraries-devlopment
263-node-content-breadcrumb-display-the-full-path-of-a-node-as-a-breadcrumb-with-each-clickable-parent
267-dev-fix-nginx-config-for-frames
272-dev-fixes-for-node-score
274-dev-more-protolude-in-prelude
275-dev-date-split-fix
280-dev-xml-code-cleanup
281-dev-ngrams-fixes
37-servant-job-flatten-breaks-the-swagger-documentation
374-dev-document-fix
376-dev-annuaire-contacts-page
376-dev-annuaire-fields
396-dev-team-management
398-dev-ngram-type-parameter
405-dev-lost-password-design
415-dev-user-empty-field
428-dev-profile-img-upload
428-dev-profile-img-upload-2
430-dev-docs-date-filter
438-dev-team-node-creator
443-dev-doc-upload-improvement
445-dev-doc-upload-lang
452-dev-teams-security
465-dev-hyperdata-graph-angle
469-dev-email-change
475-dev-node-team-invite
476-dev-fix-node-story-versions
481-dev-node-calc-upload
497-dev-node-write-selection
506-dev-search-in-tree
506-dev-tree-search-fix
513-dev-pin-tree
548-dev-reverse-url-search
551-dev-graphql-contexts-ngrams
561-dev-document-date
571-dev-node-corpus-api-search-fixes
571-dev-node-corpus-api-search-fixes-take-2
582-dev-node-phylo-init
59-dev-404-error-when-node-doesnt-exist
592-dev-document-upload-abstract
594-dev-ngrams-click-fixes
596-dev-ngrams-initial-sync-fix
603-dev-istex-zip-file-upload
67-dev-ci
68-dev-garg-v3-csv-parser
70-dev-searx-parser
73-dev-more-generic-csv-parser
74-dev-frame-calc-csv-import
77-dev-search-result-type-fix
78-dev-list-ids
79-dev-rewrite-better-record-syntax
81-dev-fix-parsers-conduit-length
81-dev-zip-upload
86-dev-graphql
86-dev-graphql-alp
86-dev-graphql-nested
87-term-s-grouping-broken-on-cnrs-gargantext-org
90-dev-async-jobs-with-push-event
90-dev-flow-corpus-progress-report
90-dev-hal-box-fix
90-dev-hal-fixes
90-dev-max-docs-scrapers-parsers
97-dev-istex-search
adinapoli/developer-guidelines
adinapoli/disable-policy-checks
adinapoli/drop-servant-static-th
adinapoli/fix-datafield-instance
adinapoli/fix-phylo-types
adinapoli/fix-scheduler
adinapoli/hotfix-for-datafield-json-instance
adinapoli/improve-cabal
adinapoli/improve-cabal-ci-caching
adinapoli/improve-cabal-old
adinapoli/investigate-issue-192
adinapoli/issue-180-deps-audit
adinapoli/issue-182
adinapoli/issue-185-job-api
adinapoli/issue-185-job-api-part-2
adinapoli/issue-187-update-haskell-igraph
adinapoli/issue-188
adinapoli/issue-198
adinapoli/issue-198-part-2
adinapoli/issue-217
adinapoli/issue-226
adinapoli/issue-250
adinapoli/issue-252
adinapoli/issue-258
adinapoli/issue-258-part-2
adinapoli/issue-259
adinapoli/issue-259-design-1
adinapoli/issue-261
adinapoli/issue-267
adinapoli/issue-267-part-2
adinapoli/issue-267-part-3
adinapoli/issue-273
adinapoli/issue-273-part-2
adinapoli/issue-276
adinapoli/issue-279
adinapoli/issue-284
adinapoli/issue-incorrect-pagination
adinapoli/mac-fixes
adinapoli/more-db-test-coverage
adinapoli/raw-query-to-pubmed
adinapoli/restore-ci
adinapoli/switch-hsvm
adinapoli/try-stack2cabal
alp/nix
alp/no-gfortran-extralib
client-executable
client-graphql-endpoint
dbg-perf-order2-graph
debug-nans
dev-104-adding-language
dev-177-DoorWelcome
dev-177-DoorWelcome-v2
dev-250-addChineze
dev-593-pubmed-api-key
dev-9.0-upgrade
dev-addDoc
dev-annuaire-file-upload
dev-bdd
dev-bench
dev-big-file-upload
dev-bipartite
dev-cache-optimization
dev-cbor
dev-charts-update-economy
dev-ci
dev-client
dev-code
dev-community
dev-contributing
dev-corpora-from-write-nodes
dev-dashoard-charts
dev-db-schema
dev-debian-install-script
dev-debug
dev-debug-invitation
dev-default-extensions
dev-demo
dev-distributional
dev-doc-annotation-issue
dev-doc-table-cache-issue
dev-doc-table-optimization
dev-doc-table-score
dev-dockerfile-ca-certificates-fix
dev-docs-chart-update
dev-docs-download
dev-docs-in-abstract
dev-ekg-monitoring
dev-epo-integration
dev-epo-patents
dev-fib
dev-file-name
dev-file-upload
dev-fix-broken-pure-refactor
dev-fix-node-children
dev-fix-node-update-endpoint
dev-flow
dev-forgot-password
dev-gargantext-ini-fix
dev-getting-started-readme
dev-ghc9.2-acc1.3-etc
dev-gql-tree-api
dev-graph
dev-graph-explorer-gexf
dev-graph-multipartite
dev-graph-screenshot
dev-graph-screenshot-corpus-id-fix
dev-graph-search-in-groups-not-in-labels
dev-hackathon-fixes
dev-hash
dev-hyperdata
dev-ihaskell-codebook
dev-ilike-search-fix
dev-indexation
dev-infomap
dev-ini-fixes
dev-invitation-error
dev-iramuteq
dev-kawen
dev-lastmod-cache-tmp
dev-list-charts
dev-list-downloadable
dev-list-downloadable-with-content-type
dev-listfix
dev-login
dev-logs
dev-lts-16.26-upgrade
dev-maplist
dev-merge
dev-merge-nix
dev-merge-nix-2
dev-metrics
dev-ngrams-groups
dev-ngrams-repo-optim
dev-ngrams-score-recomputation
dev-ngrams-table-online
dev-no-freeze
dev-node-board-add-text-cells
dev-notebook
dev-openalex
dev-optim
dev-order1
dev-order2
dev-padagraph
dev-password
dev-phylo
dev-phylo-accuracy
dev-phylo-merge
dev-phylo-quality
dev-phylo-strict
dev-phylo-uniform_accuracy
dev-phyloDebug
dev-public
dev-public-node-api
dev-pubmed
dev-query
dev-readme-update
dev-refact
dev-refact-graph
dev-refactor-metrics
dev-scores
dev-small-fixes
dev-social-list
dev-sources-chart-sort
dev-sql-run-insert-deprecation-fix
dev-stack-18.16-upgrade
dev-stack-upgrade
dev-swagger
dev-term-list-fix
dev-test
dev-textflow
dev-tokens-lemma
dev-tree-gql-improvements
dev-tree-reload
dev-treedebug
dev-typeclasses-refactoring
dev-user-contact
dev-userid-in-auth
dev-version
dev-websockets
dev-wikidata
developer-guidelines
fix-confluence-indices-bugs
fix-haddock-parse-error
flexible-job-queue
garg-init-errror-msg
gitlab-ci-build-nix
jobqueue-fairness
jobqueue-test-delay
lists-endpoint-accept-json
mailmap
master
ngrams-replace
ngrams-replace-dev-merge
nix
nothunks
patch-1
phylo_paper
pin-shell
revert-0b51636b
stable
testing
update-build-shell-nix-merge
update-build-shell.nix
0.0.6.9.9.9.3.1
0.0.6.9.9.9.3
0.0.6.9.9.9.2
0.0.6.9.9.9.1
0.0.6.9.9.9
0.0.6.9.9.8.3.4
0.0.6.9.9.8.3.3
0.0.6.9.9.8.3.2
0.0.6.9.9.8.3.1
0.0.6.9.9.8.3
0.0.6.9.9.8.2
0.0.6.9.9.8.1
0.0.6.9.9.8
0.0.6.9.9.7.9
0.0.6.9.9.7.8
0.0.6.9.9.7.7
0.0.6.9.9.7.6.4
0.0.6.9.9.7.6.3
0.0.6.9.9.7.6.2
0.0.6.9.9.7.6.1
0.0.6.9.9.7.6
0.0.6.9.9.7.5.1
0.0.6.9.9.7.5
0.0.6.9.9.7.4
0.0.6.9.9.7.3
0.0.6.9.9.7.2
0.0.6.9.9.7.1
0.0.6.9.9.7
0.0.6.9.9.6.9
0.0.6.9.9.6.8
0.0.6.9.9.6.7
0.0.6.9.9.6.6
0.0.6.9.9.6.5
0.0.6.9.9.6.4
0.0.6.9.9.6.3
0.0.6.9.9.6.2
0.0.6.9.9.6.1
0.0.6.9.9.6
0.0.6.9.9.5.8
0.0.6.9.9.5.7
0.0.6.9.9.5.6
0.0.6.9.9.5.5
0.0.6.9.9.5.4
0.0.6.9.9.5.3
0.0.6.9.9.5.2
0.0.6.9.9.5.1
0.0.6.9.9.5
0.0.6.9.9.4.6
0.0.6.9.9.4.5
0.0.6.9.9.4.4
0.0.6.9.9.4.3
0.0.6.9.9.4.2
0.0.6.9.9.4.1
0.0.6.9.9.4
0.0.6.9.9.3.3
0.0.6.9.9.3.2
0.0.6.9.9.3.1
0.0.6.9.9.3
0.0.6.9.9.2
0.0.6.9.9.1
0.0.6.9.9
0.0.6.9.8.7.1
0.0.6.9.8.7
0.0.6.9.8.6.2
0.0.6.9.8.6.1
0.0.6.9.8.6
0.0.6.9.8.5.1
0.0.6.9.8.5
0.0.6.9.8.4
0.0.6.9.8.3
0.0.6.9.8.2.2
0.0.6.9.8.2.1
0.0.6.9.8.2
0.0.6.9.8.1
0.0.6.9.8
0.0.6.9.7.6
0.0.6.9.7.5
0.0.6.9.7.4
0.0.6.9.7.3
0.0.6.9.7.2
0.0.6.9.7.1
0.0.6.9.7
0.0.6.9.6
0.0.6.9.5
0.0.6.9.4.9
0.0.6.9.4.8
0.0.6.9.4.7
0.0.6.9.4.6
0.0.6.9.4.5
0.0.6.9.4.4
0.0.6.9.4.3
0.0.6.9.4.2
0.0.6.9.4.1
0.0.6.9.4
0.0.6.9.3
0.0.6.9.2
0.0.6.9.1
0.0.6.8.6
0.0.6.8.5.9.4
0.0.6.8.5.9.3
0.0.6.8.5.9.2
0.0.6.8.5.9.1
0.0.6.8.5.9
0.0.6.8.5.8
0.0.6.8.5.7
0.0.6.8.5.6
0.0.6.8.5.5
0.0.6.8.5.4
0.0.6.8.5.3
0.0.6.8.5.2
0.0.6.8.5.1
0.0.6.8.5
0.0.6.8.4
0.0.6.8.3
0.0.6.8.2
0.0.6.8.1
0.0.6.8
0.0.6.7.2
0.0.6.7.1
0.0.6.7
0.0.6.6
0.0.6.5.1
0.0.6.5
0.0.6.4
0.0.6.3
0.0.6.2
0.0.6.1
0.0.6
0.0.5.9.6
0.0.5.9.5
0.0.5.9.4
0.0.5.9.3
0.0.5.9.2
0.0.5.9.1
0.0.5.9
0.0.5.8.9.9
0.0.5.8.9.8
0.0.5.8.9.7
0.0.5.8.9.6
0.0.5.8.9.5
0.0.5.8.9.4
0.0.5.8.9.3
0.0.5.8.9.2
0.0.5.8.9.1
0.0.5.8.9
0.0.5.8.8.2
0.0.5.8.8.1
0.0.5.8.8
0.0.5.8.7.2
0.0.5.8.7.1
0.0.5.8.7
0.0.5.8.6
0.0.5.8.5.1
0.0.5.8.5
0.0.5.8.4
0.0.5.8.3
0.0.5.8.2
0.0.5.8.1
0.0.5.8
0.0.5.7.9.1
0.0.5.7.9
0.0.5.7.8
0.0.5.7.7
0.0.5.7.6
0.0.5.7.5
0.0.5.7.4
0.0.5.7.3
0.0.5.7.2
0.0.5.7.1
0.0.5.7
0.0.5.6.7
0.0.5.6.6
0.0.5.6.5
0.0.5.6.4
0.0.5.6.3
0.0.5.6.2
0.0.5.6.1
0.0.5.6
0.0.5.5.7
0.0.5.5.6
0.0.5.5.5
0.0.5.5.4
0.0.5.5.3
0.0.5.5.2
0.0.5.5.1
0.0.5.5
0.0.5.3
0.0.5.2
0.0.5.1
0.0.5
0.0.4.9.9.6
0.0.4.9.9.5
0.0.4.9.9.4
0.0.4.9.9.3
0.0.4.9.9.2
0.0.4.9.9.1
0.0.4.9.9
0.0.4.9.8
0.0.4.9.7
0.0.4.9.6
0.0.4.9.5
0.0.4.9.4
0.0.4.9.3
0.0.4.9.2
0.0.4.9.1
0.0.4.9
0.0.4.8.9
0.0.4.8.8
0.0.4.8.7
0.0.4.8.6
0.0.4.8.5
0.0.4.8.4
0.0.4.8.3
0.0.4.8.2
0.0.4.8.1
0.0.4.8
0.0.4.7.3
0.0.4.7.2
0.0.4.7.1
0.0.4.7
0.0.4.6.1
0.0.4.6
0.0.4.5
0.0.4.4
0.0.4.3
0.0.4.2
0.0.4.1
0.0.4
0.0.3.9.1
0.0.3.9
0.0.3.8.1
0.0.3.8
0.0.3.7
0.0.3.6
0.0.3.5
0.0.3.4
0.0.3.3
0.0.3.2
0.0.3.1
0.0.3
0.0.2.9.6.1
0.0.2.9.6
0.0.2.9.5
0.0.2.9.4
0.0.2.9.3
0.0.2.9.2
0.0.2.9.1
0.0.2.9
0.0.2.8
0.0.2.7.1
0.0.2.7
0.0.2.6
0.0.2.5
0.0.2.4
0.0.2.3
0.0.2.2.1
0.0.2.2
0.0.2.1
0.0.2.0
0.0.1.96.0
0.0.1.95.0
0.0.1.94.1
0.0.1.94.0
0.0.1.93.0
0.0.1.92.0
0.0.1.91.7
0.0.1.91.6
0.0.1.91.5
0.0.1.91.4
0.0.1.91.3
0.0.1.91.2
0.0.1.91.1
0.0.1.91.0
0.0.1.9.10
0.0.1.9.9
0.0.1.9.8
0.0.1.9.7
0.0.1.9.6
0.0.1.9.5
0.0.1.9.4
0.0.1.9.3
0.0.1.9.2
0.0.1.9.1
0.0.1.9
0.0.1.8.6
0.0.1.8.5
0.0.1.8.4
0.0.1.8.3
0.0.1.8.2
0.0.1.8.1
0.0.1.8
0.0.1.7.6
0.0.1.7.5
0.0.1.7.4
0.0.1.7.3
0.0.1.7.2
0.0.1.7.1
0.0.1.7
0.0.1.6.9
0.0.1.6.8
0.0.1.6.7
0.0.1.6.6
0.0.1.6.5
0.0.1.6.4
0.0.1.6.3
0.0.1.6.2
0.0.1.6.1
0.0.1.6
0.0.1.5.2
0.0.1.5.1
0.0.1.5
0.0.1.4.1
0.0.1.4
0.0.1.3.4
0.0.1.3.3
0.0.1.3.2
0.0.1.3.1
0.0.1.3
0.0.1.2
0.0.1.1
0.0.1.0
0.0.0.9
0.0.0.8
0.0.0.7
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
Graph.hs
src/Gargantext/Viz/Graph.hs
+1
-1
API.hs
src/Gargantext/Viz/Graph/API.hs
+5
-6
No files found.
src/Gargantext/Viz/Graph.hs
View file @
3774aa22
...
...
@@ -100,7 +100,7 @@ data GraphMetadata = GraphMetadata { _gm_title :: Text -- title of the grap
,
_gm_corpusId
::
[
NodeId
]
-- we can map with different corpus
,
_gm_legend
::
[
LegendField
]
-- legend of the Graph
,
_gm_list
::
ListForGraph
,
_gm_version
::
Int
--
, _gm_version :: Int
}
deriving
(
Show
,
Generic
)
$
(
deriveJSON
(
unPrefix
"_gm_"
)
''
G
raphMetadata
)
...
...
This diff is collapsed.
Click to expand it.
src/Gargantext/Viz/Graph/API.hs
View file @
3774aa22
...
...
@@ -65,10 +65,11 @@ getGraph :: UserId -> NodeId -> GargServer (Get '[JSON] Graph)
getGraph
uId
nId
=
do
nodeGraph
<-
getNodeWith
nId
HyperdataGraph
let
graph
=
nodeGraph
^.
node_hyperdata
.
hyperdataGraph
let
graph
Version
=
graph
^?
_Just
let
list
Version
=
graph
^?
_Just
.
graph_metadata
.
_Just
.
gm_version
.
gm_list
.
lfg_version
v
<-
currentVersion
nodeUser
<-
getNodeWith
(
NodeId
uId
)
HyperdataUser
...
...
@@ -85,7 +86,7 @@ getGraph uId nId = do
_
<-
insertGraph
cId
uId'
(
HyperdataGraph
$
Just
graph'
)
pure
graph'
Just
graph'
->
if
graph
Version
==
Just
v
Just
graph'
->
if
list
Version
==
Just
v
then
pure
graph'
else
do
graph''
<-
computeGraph
cId
NgramsTerms
v
...
...
@@ -98,14 +99,12 @@ getGraph uId nId = do
computeGraph
::
CorpusId
->
NgramsType
->
Int
->
GargServer
(
Get
'[
J
SON
]
Graph
)
computeGraph
cId
nt
v
=
do
lId
<-
defaultList
cId
v'
<-
currentVersion
let
metadata
=
GraphMetadata
"Title"
[
cId
]
[
LegendField
1
"#FFF"
"Cluster"
,
LegendField
2
"#FFF"
"Cluster"
]
(
ListForGraph
lId
v'
)
v
(
ListForGraph
lId
v
)
-- (map (\n -> LegendField n "#FFFFFF" (pack $ show n)) [1..10])
lIds
<-
selectNodesWithUsername
NodeList
userMaster
...
...
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