Merge branch 'master' into feature/ch174753/check-email-verification-process-and-account

NEWS.md

@@ -5,6 +5,7 @@ Development
 - None yet
 
 ### Features
+* Upgrade to deck.gl 8.5.6 [16338](https://github.com/CartoDB/cartodb/pull/16338)
 * Update DO Catalog dependencies and some changes to use bundle on CARTO Workspace [#16325](https://github.com/CartoDB/cartodb/pull/16325)
 * Send data to Hubspot when accessing datasets [#16313](https://github.com/CartoDB/cartodb/pull/16313)
 * Request access to datasets directly from DO Catalog [#16291](https://github.com/CartoDB/cartodb/pull/16291)
@@ -22,6 +23,7 @@ Development
 - Use the organization user's data while editing a user from organization settings [#16280](https://github.com/CartoDB/cartodb/pull/16280)
 - Fix schema name in layers created by free users [#16307](https://github.com/CartoDB/cartodb/pull/16307)
 - Limit start parameter of Dropbox connector [#16264](https://github.com/CartoDB/cartodb/pull/16264)
+- Fix deck.gl dependency conflicts [#16339](https://github.com/CartoDB/cartodb/pull/16339)
 - Migrate Redis DO subscription information in inter-cloud migrations [#16315](https://github.com/CartoDB/cartodb/pull/16315)
 - OauthApps restricted by default [#16304](https://github.com/CartoDB/cartodb/pull/16304)
 - Support staging hostname in the catalog [#16258](https://github.com/CartoDB/cartodb/pull/16258)
@@ -50,6 +52,7 @@ Development
 - Add setting to disable diagnosis page [#16324](https://github.com/CartoDB/cartodb/pull/16324)
 - Fix wrong layer schema when creating a map from a shared dataset [#16323](https://github.com/CartoDB/cartodb/pull/16323)
 - Fix auto guessing when a csv field is wrong [#16326](https://github.com/CartoDB/cartodb/pull/16326)
+- Fix regenerating API Keys for a whole organization [#16336](https://github.com/CartoDB/cartodb/pull/16336)
 
 4.45.0 (2021-04-14)
 -------------------

app/controllers/admin/organizations_controller.rb

@@ -131,7 +131,7 @@ class Admin::OrganizationsController < Admin::AdminController
 
   def regenerate_all_api_keys
     valid_password_confirmation
-    @organization.users.each(&:regenerate_all_api_keys)
+    @organization.users.map(&:sequel_user).each(&:regenerate_all_api_keys)
 
     redirect_to CartoDB.url(self, 'organization_settings', user: current_user),
                 flash: { success: "Users API keys regenerated successfully" }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.259",
+  "version": "1.0.0-assets.261",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",
@@ -23,15 +23,15 @@
     "@carto/carto.js": "^4.2.1",
     "@carto/toolkit-core": "0.0.1-rc.18",
     "@carto/toolkit-custom-storage": "0.0.1-rc.18",
-    "@carto/viewer": "CartoDB/viewer#v1.0.6",
+    "@carto/viewer": "github:CartoDB/viewer#v1.0.7",
     "@carto/zera": "1.0.7",
-    "@deck.gl/carto": "8.5.2",
-    "@deck.gl/core": "8.5.2",
-    "@deck.gl/extensions": "8.5.2",
-    "@deck.gl/geo-layers": "8.5.2",
-    "@deck.gl/google-maps": "8.5.2",
-    "@deck.gl/layers": "8.5.2",
-    "@deck.gl/mesh-layers": "8.5.2",
+    "@deck.gl/carto": "8.5.6",
+    "@deck.gl/core": "8.5.6",
+    "@deck.gl/extensions": "8.5.6",
+    "@deck.gl/geo-layers": "8.5.6",
+    "@deck.gl/google-maps": "8.5.6",
+    "@deck.gl/layers": "8.5.6",
+    "@deck.gl/mesh-layers": "8.5.6",
     "babel-polyfill": "^6.26.0",
     "backbone": "1.2.3",
     "backbone-forms": "0.14.0",