Merge branch 'master' into 4809-issue

app/controllers/superadmin/users_controller.rb

@@ -105,7 +105,8 @@ class Superadmin::UsersController < Superadmin::SuperadminController
         id: entry.id,
         data_type: entry.data_type,
         date: entry.updated_at,
-        status: entry.success.nil? ? false : entry.success
+        status: entry.success.nil? ? false : entry.success,
+        state: entry.state
       }
     })
   end
@@ -139,7 +140,8 @@ class Superadmin::UsersController < Superadmin::SuperadminController
         id: entry.id,
         data_type: entry.service_name,
         date: entry.updated_at,
-        status: entry.success?
+        status: entry.success?,
+        state: entry.state
       }
     })
   end

lib/assets/core/javascripts/cartodb3/editor/layers/layer-content-views/analyses/data-observatory-metadata.js

@@ -3,7 +3,11 @@ var Backbone = require('backbone');
 var cdb = require('cartodb.js');
 
 function getQueryForGeometryType (geometryType) {
-  return 'select * from obs_legacybuildermetadata(\'' + (geometryType === 'polygon' ? 'sum' : '') + '\')';
+  if (geometryType === 'polygon') {
+    return "select * from obs_legacybuildermetadata('sum')";
+  } else {
+    return 'select * from obs_legacybuildermetadata()';
+  }
 }
 
 /**

package.json

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

services/importer/lib/importer/downloader.rb

@@ -345,9 +345,20 @@ module CartoDB
       end
 
       def filename_from_url
-        url_name = self.class.url_filename_regex.match(URI.decode(@translated_url)).to_s
+        filename = CGI.unescape(File.basename(URI(@translated_url).path))
 
-        url_name unless url_name.empty?
+        extension = File.extname(filename)
+        if extension.present? && self.class.supported_extensions.include?(extension)
+          filename
+        else
+          # For non-conventional URLs (i.e: filename in params)
+          regex_match = self.class
+                            .url_filename_regex
+                            .match(@translated_url)
+                            .to_s
+
+          regex_match if regex_match.present?
+        end
       end
 
       CONTENT_TYPES_MAPPING = [