Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
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
Przemyslaw Kaminski
haskell-gargantext
Commits
f2728eb9
Commit
f2728eb9
authored
Feb 11, 2019
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FIX] HyperdataList Arbitrary needs a fix.
parent
8f7b0261
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
8 deletions
+17
-8
Ngrams.hs
src/Gargantext/API/Ngrams.hs
+11
-7
Flow.hs
src/Gargantext/Database/Flow.hs
+2
-1
Node.hs
src/Gargantext/Database/Types/Node.hs
+4
-0
No files found.
src/Gargantext/API/Ngrams.hs
View file @
f2728eb9
...
...
@@ -151,6 +151,8 @@ instance Arbitrary NgramsElement where
newtype
NgramsTable
=
NgramsTable
[
NgramsElement
]
deriving
(
Ord
,
Eq
,
Generic
,
ToJSON
,
FromJSON
,
Show
)
type
ListNgrams
=
NgramsTable
makePrisms
''
N
gramsTable
instance
Each
NgramsTable
NgramsTable
NgramsElement
NgramsElement
where
...
...
@@ -662,9 +664,9 @@ tableNgramsPatch :: (HasNgramError err, HasInvalidError err,
->
Versioned
NgramsTablePatch
->
m
(
Versioned
NgramsTablePatch
)
tableNgramsPatch
_corpusId
maybeTabType
listId
(
Versioned
p_version
p_table
)
=
do
let
ngramsType
=
ngramsTypeFromTabType
maybeTabType
let
(
p0
,
p0_validity
)
=
PM
.
singleton
listId
p_table
let
(
p
,
p_validity
)
=
PM
.
singleton
ngramsType
p0
let
ngramsType
=
ngramsTypeFromTabType
maybeTabType
(
p0
,
p0_validity
)
=
PM
.
singleton
listId
p_table
(
p
,
p_validity
)
=
PM
.
singleton
ngramsType
p0
assertValid
p0_validity
assertValid
p_validity
...
...
@@ -681,6 +683,7 @@ tableNgramsPatch _corpusId maybeTabType listId (Versioned p_version p_table) = d
p'_applicable
=
applicable
p'
(
r
^.
r_state
)
in
pure
(
r'
,
(
p'_applicable
,
Versioned
(
r'
^.
r_version
)
q'_table
))
assertValid
p'_applicable
pure
vq'
...
...
@@ -705,9 +708,9 @@ mergeNgramsElement _neOld neNew = neNew
}
-}
get
TableNgrams'
::
RepoCmdM
env
err
m
=>
[
NodeId
]
->
NgramsType
->
m
(
Versioned
NgramsTable
)
get
TableNgrams'
nodeIds
ngramsType
=
do
get
ListNgrams
::
RepoCmdM
env
err
m
=>
[
NodeId
]
->
NgramsType
->
m
(
Versioned
ListNgrams
)
get
ListNgrams
nodeIds
ngramsType
=
do
v
<-
view
repoVar
repo
<-
liftIO
$
readMVar
v
...
...
@@ -723,6 +726,7 @@ getTableNgrams' nodeIds ngramsType = do
-- | TODO Errors management
-- TODO: polymorphic for Annuaire or Corpus or ...
-- | Table of Ngrams is a ListNgrams formatted (sorted and/or cut).
getTableNgrams
::
RepoCmdM
env
err
m
=>
CorpusId
->
Maybe
TabType
->
[
ListId
]
->
Maybe
Limit
->
Maybe
Offset
...
...
@@ -738,6 +742,6 @@ getTableNgrams _cId maybeTabType listIds mlimit moffset = do
limit_
=
maybe
defaultLimit
identity
mlimit
offset_
=
maybe
0
identity
moffset
get
TableNgrams'
listIds
ngramsType
get
ListNgrams
listIds
ngramsType
&
mapped
.
v_data
.
_NgramsTable
%~
(
take
limit_
.
drop
offset_
)
src/Gargantext/Database/Flow.hs
View file @
f2728eb9
...
...
@@ -200,7 +200,8 @@ subFlowCorpus username cName = do
pure
(
userId
,
rootId
,
corpusId
)
subFlowAnnuaire
::
HasNodeError
err
=>
Username
->
CorpusName
->
Cmd
err
(
UserId
,
RootId
,
CorpusId
)
subFlowAnnuaire
::
HasNodeError
err
=>
Username
->
CorpusName
->
Cmd
err
(
UserId
,
RootId
,
CorpusId
)
subFlowAnnuaire
username
_cName
=
do
maybeUserId
<-
getUser
username
...
...
src/Gargantext/Database/Types/Node.hs
View file @
f2728eb9
...
...
@@ -318,6 +318,10 @@ data HyperdataList = HyperdataList { hyperdataList_preferences :: Maybe Text
$
(
deriveJSON
(
unPrefix
"hyperdataList_"
)
''
H
yperdataList
)
instance
Hyperdata
HyperdataList
instance
Arbitrary
HyperdataList
where
arbitrary
=
elements
[
HyperdataList
(
Just
"from list A"
)]
------------------------------------------------------------------------
data
HyperdataScore
=
HyperdataScore
{
hyperdataScore_preferences
::
Maybe
Text
}
deriving
(
Show
,
Generic
)
...
...
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