Skip to content

haskell-gargantext
haskell-gargantext
Commit 6c152aab authored by Alexandre Delanoë's avatar Alexandre Delanoë
Browse files
Options

Merge branch 'dev' of ssh://gitlab.iscpif.fr:20022/gargantext/haskell-gargantext into dev

parents 88befdc7 c09d2b80
Pipeline #483 canceled with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 7 additions and 6 deletions
    src/Gargantext/API/Ngrams.hs
    View file @ 6c152aab
    ...@@ -201,12 +201,12 @@ mkNgramsElement ngrams list rp children = ...@@ -201,12 +201,12 @@ mkNgramsElement ngrams list rp children =
    -- TODO review -- TODO review
    size = 1 + count " " ngrams size = 1 + count " " ngrams
    newNgramsElement :: NgramsTerm -> NgramsElement newNgramsElement :: Maybe ListType -> NgramsTerm -> NgramsElement
    newNgramsElement ngrams = mkNgramsElement ngrams GraphTerm Nothing mempty newNgramsElement mayList ngrams = mkNgramsElement ngrams (fromMaybe GraphTerm mayList) Nothing mempty
    instance ToSchema NgramsElement instance ToSchema NgramsElement
    instance Arbitrary NgramsElement where instance Arbitrary NgramsElement where
    arbitrary = elements [newNgramsElement "sport"] arbitrary = elements [newNgramsElement Nothing "sport"]
    ngramsElementToRepo :: NgramsElement -> NgramsRepoElement ngramsElementToRepo :: NgramsElement -> NgramsRepoElement
    ngramsElementToRepo ngramsElementToRepo
    ...@@ -794,9 +794,9 @@ putListNgrams listId ngramsType nes = do ...@@ -794,9 +794,9 @@ putListNgrams listId ngramsType nes = do
    where where
    m = Map.fromList $ (\n -> (n ^. ne_ngrams, ngramsElementToRepo n)) <$> nes m = Map.fromList $ (\n -> (n ^. ne_ngrams, ngramsElementToRepo n)) <$> nes
    tableNgramsPost :: RepoCmdM env err m => TabType -> NodeId -> [NgramsTerm] -> m () tableNgramsPost :: RepoCmdM env err m => TabType -> NodeId -> Maybe ListType -> [NgramsTerm] -> m ()
    tableNgramsPost tabType listId = tableNgramsPost tabType listId mayList =
    putListNgrams listId (ngramsTypeFromTabType tabType) . fmap newNgramsElement putListNgrams listId (ngramsTypeFromTabType tabType) . fmap (newNgramsElement mayList)
    -- Apply the given patch to the DB and returns the patch to be applied on the -- Apply the given patch to the DB and returns the patch to be applied on the
    -- client. -- client.
    ...@@ -1009,6 +1009,7 @@ type TableNgramsApiPut = Summary " Table Ngrams API Change" ...@@ -1009,6 +1009,7 @@ type TableNgramsApiPut = Summary " Table Ngrams API Change"
    type TableNgramsApiPost = Summary " Table Ngrams API Adds new ngrams" type TableNgramsApiPost = Summary " Table Ngrams API Adds new ngrams"
    :> QueryParamR "ngramsType" TabType :> QueryParamR "ngramsType" TabType
    :> QueryParamR "list" ListId :> QueryParamR "list" ListId
    :> QueryParam "listType" ListType
    :> ReqBody '[JSON] [NgramsTerm] :> ReqBody '[JSON] [NgramsTerm]
    :> Post '[JSON] () :> Post '[JSON] ()
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment