Merge branch 'master' into 13122-redesign-add-buttons

NEWS.md

@@ -330,6 +330,7 @@ ion for time-series (#12670)
 * Fix for legends when there is only one element in the ramp (cartodb.js#1938)
 * Treat all time series dataview timestamps as UTC (#13070)
 * Fix datasets downloaded as "cartodb-query" [Support #1179](https://github.com/CartoDB/support/issues/1179)
+* Enable CSV exports for polygon and line datasets (#13212)
 
 ### Internals
 * Use engine instead of visModel internally (#12992)

lib/assets/core/javascripts/cartodb3/components/modals/export-data/modal-export-data-view.js

@@ -14,8 +14,7 @@ var FORMATS = [
   {
     format: 'csv',
     fetcher: 'fetchCSV',
-    geomRequired: false,
-    geomRestricted: ['point']
+    geomRequired: false
   }, {
     format: 'shp',
     fetcher: 'fetch',

lib/assets/core/test/spec/cartodb3/components/modals/export-data/modal-export-data-view.spec.js

@@ -41,14 +41,22 @@ describe('components/modals/export-data/modal-export-data-view', function () {
       expect(this.view.$('[data-format=csv]:checked').length).toBe(1);
     });
 
+    it('should render properly for lines', function () {
+      this.queryGeometryModel.set('simple_geom', 'line');
+      this.view.render();
+
+      expect(this.view.$('.Modal-listFormItem').length).toBe(5);
+      expect(this.view.$('.Modal-listFormItem.is-disabled').length).toBe(0);
+      expect(this.view.$('[data-format=csv]:checked').length).toBe(1);
+    });
+
     it('should render properly for polygons', function () {
       this.queryGeometryModel.set('simple_geom', 'polygon');
       this.view.render();
 
       expect(this.view.$('.Modal-listFormItem').length).toBe(5);
-      expect(this.view.$('.Modal-listFormItem.is-disabled').length).toBe(1);
-      expect(this.view.$('[data-format=csv]:checked').length).toBe(0);
-      expect(this.view.$('[data-format=shp]:checked').length).toBe(1);
+      expect(this.view.$('.Modal-listFormItem.is-disabled').length).toBe(0);
+      expect(this.view.$('[data-format=csv]:checked').length).toBe(1);
     });
 
     it('should render properly for no geometries', function () {

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "4.10.118",
+  "version": "4.10.119",
   "dependencies": {
     "accessory": {
       "version": "1.0.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "4.10.118.13122",
+  "version": "4.10.119.13122",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",