Merge branch 'dev' into 203-dev-corpus-json-import

CHANGELOG.md

+## Version 0.0.6.9.9.4.5
+
+* [BACK][OPTIM][[Node terms] Random slowness on loading a page list of terms (#199)](https://gitlab.iscpif.fr/gargantext/haskell-gargantext/issues/199)
+
+## Version 0.0.6.9.9.4.4
+
+* [FRONT][FIX/WIP][[Term table] Add term should not be suggested when term is already added (#544)](https://gitlab.iscpif.fr/gargantext/purescript-gargantext/issues/544)
+* [FRONT][FIX] File Type vs Node Type
+
 ## Version 0.0.6.9.9.4.3
 
 * [FRONT][FIX][APi tab not shown (#540)](https://gitlab.iscpif.fr/gargantext/purescript-gargantext/issues/540)

gargantext.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           gargantext
-version:        0.0.6.9.9.4.3
+version: 0.0.6.9.9.4.5
 synopsis:       Search, map, share
 description:    Please see README.md
 category:       Data
@@ -56,7 +56,6 @@ library
       Gargantext.Core.Text.Corpus.Parsers
       Gargantext.Core.Text.Corpus.Parsers.CSV
       Gargantext.Core.Text.Corpus.Parsers.Date.Parsec
-      Gargantext.Core.Text.Corpus.Parsers.JSON
       Gargantext.Core.Text.List.Formats.CSV
       Gargantext.Core.Text.Metrics
       Gargantext.Core.Text.Metrics.CharByChar

package.yaml

@@ -6,7 +6,7 @@ name: gargantext
 #         | | | +-----  Layers * : New versions with API additions
 #         | | | | +---  Layers * : New versions without API breaking changes
 #         | | | | |
-version: '0.0.6.9.9.4.3'
+version: '0.0.6.9.9.4.5'
 synopsis: Search, map, share
 description: Please see README.md
 category: Data

src/Gargantext/Database/Action/Metrics/NgramsByContext.hs

@@ -122,31 +122,29 @@ getOccByNgramsOnlyFast cId lId nt = do
            -> Cmd err [(Text, DPST.PGArray Int)]
       run cId' lId' nt' = runPGSQuery query
                 ( cId'
-                , cId'
                 , lId'
                 , ngramsTypeId nt'
                 )
 
       query :: DPS.Query
       query = [sql|
-              SELECT ng.terms
-                     , ARRAY(
-                         SELECT DISTINCT context_node_ngrams.context_id
-                         FROM context_node_ngrams
-                         JOIN nodes_contexts
-                           ON context_node_ngrams.context_id = nodes_contexts.context_id
-                         WHERE ng.id = context_node_ngrams.ngrams_id
-                         AND nodes_contexts.node_id = ?
-                         ) AS context_ids
-                FROM ngrams   ng
-                JOIN node_stories       ns  ON ng.id        = ns.ngrams_id
-                JOIN node_node_ngrams   nng ON ns.node_id   = nng.node2_id
-                WHERE nng.node1_id        = ?
-                      AND nng.node2_id    = ?
-                      AND nng.ngrams_type = ?
-                      AND nng.ngrams_id   = ng.id
-                      AND nng.ngrams_type = ns.ngrams_type_id
-                ORDER BY ng.id ASC;
+                WITH node_context_ids AS
+                  (select context_id, ngrams_id
+                  FROM context_node_ngrams_view
+                  WHERE node_id = ?
+                  ), ns AS
+                (select ngrams_id FROM node_stories
+                  WHERE node_id = ? AND ngrams_type_id = ?
+                )
+
+                SELECT ng.terms,
+                ARRAY ( SELECT DISTINCT context_id
+                          FROM node_context_ids
+                          WHERE ns.ngrams_id = node_context_ids.ngrams_id
+                      )
+                AS context_ids
+                FROM ngrams ng
+                JOIN ns ON ng.id = ns.ngrams_id
         |]