Merge remote-tracking branch 'origin/romain-testing' into testing-merge

gargantext/views/pages/terms.py

@@ -2,7 +2,7 @@ from gargantext.util.http     import requires_auth, render, settings
 from gargantext.util.db       import session
 from gargantext.util.db_cache import cache
 from gargantext.models        import Node
-from gargantext.constants     import get_resource_by_name
+from gargantext.constants     import get_resource
 from datetime                 import datetime
 
 @requires_auth
@@ -31,6 +31,7 @@ def ngramtable(request, project_id, corpus_id):
                                # .filter(Node.id != corpus_id)
     corpora_infos = corpora_infos_q.all()
 
+    source_type = corpus.resources()[0]['type']
 
     # rendered page : terms.html
     return render(
@@ -42,7 +43,7 @@ def ngramtable(request, project_id, corpus_id):
             'date': datetime.now(),
             'project': project,
             'corpus' : corpus,
-            'resourcename' : get_resource_by_name(corpus),
+            'resourcename' : get_resource(source_type)['name'],
             'view': 'terms',
 
             # for the CSV import modal

static/lib/gargantext/Authors_dyna_chart_and_table.js

@@ -418,15 +418,14 @@ function Main_test( data , initial) {
             // // .xUnits(d3.time.months)
             .renderlet(function (chart) {
                 chart.select("g.y").style("display", "none");
-                LineChart.filter(chart.filter());
-                console.log("lalaal moveChart.focus(chartfilt);")
             })
             .on("filtered", function (chart) {
                 dc.events.trigger(function () {
                     var chartfilt = chart.filter()
+                    console.log("lalaal move chart", chartfilt)
                     // tricky part: identifying when the moveChart changes.
                     if(chartfilt) {
-                        Push2Buffer ( chart.filter() )
+                        Push2Buffer ( chartfilt )
                     } else {
                         if(TheBuffer) {
                             Push2Buffer ( false )

static/lib/gargantext/Docs_dyna_chart_and_table.js

@@ -524,16 +524,16 @@ function Main_test(Data) {
           .xUnits(d3.time.months)
           .renderlet(function (chart) {
               chart.select("g.y").style("display", "none");
-              moveChart.filter(chart.filter());
           })
           .on("filtered", function (chart) {
               dc.events.trigger(function () {
                   var chartfilt = chart.filter()
+                  console.log("lalaal move chart", chartfilt)
                   // tricky part: identifying when the moveChart changes.
                   if(chartfilt) {
                       console.log("chart.filter()")
-                      console.log(chart.filter())
-                      Push2Buffer ( chart.filter() )
+                      console.log(chartfilt)
+                      Push2Buffer (chartfilt)
                   } else {
                       if(TheBuffer) {
                           Push2Buffer ( false )

static/lib/gargantext/NGrams_dyna_chart_and_table.js

@@ -2187,15 +2187,14 @@ function MainTableAndCharts( ngdata , initial , search_filter) {
             // // .xUnits(d3.time.months)
             .renderlet(function (chart) {
                 chart.select("g.y").style("display", "none");
-                LineChart.filter(chart.filter());
-                // console.log("lalaal moveChart.focus(chartfilt);")
             })
             .on("filtered", function (chart) {
                 dc.events.trigger(function () {
                     var chartfilt = chart.filter()
+                    console.log("lalaal move chart", chartfilt)
                     // tricky part: identifying when the moveChart changes.
                     if(chartfilt) {
-                        Push2Buffer ( chart.filter() )
+                        Push2Buffer ( chartfilt )
                     } else {
                         if(TheBuffer) {
                             Push2Buffer ( false )

static/lib/gargantext/Sources_dyna_chart_and_table.js

@@ -418,15 +418,14 @@ function Main_test( data , initial) {
             // // .xUnits(d3.time.months)
             .renderlet(function (chart) {
                 chart.select("g.y").style("display", "none");
-                LineChart.filter(chart.filter());
-                console.log("lalaal moveChart.focus(chartfilt);")
             })
             .on("filtered", function (chart) {
                 dc.events.trigger(function () {
                     var chartfilt = chart.filter()
+                    console.log("lalaal move chart", chartfilt)
                     // tricky part: identifying when the moveChart changes.
                     if(chartfilt) {
-                        Push2Buffer ( chart.filter() )
+                        Push2Buffer ( chartfilt )
                     } else {
                         if(TheBuffer) {
                             Push2Buffer ( false )