Merge branch 'master' into bug/sc-95788/404-html-has-no-body

NEWS.md

@@ -71,6 +71,8 @@ Development
 - Fix Auth URL generation while establishing a connection with Google Drive [#16357](https://github.com/CartoDB/cartodb/pull/16357)
 - Fix adding license metadata to a dataset [#16356](https://github.com/CartoDB/cartodb/pull/16356)
 - Fix notifications when organization seats limit is reached [#16359](https://github.com/CartoDB/cartodb/pull/16359)
+- Fix privacy dropdown when user is editing a map [#16367](https://github.com/CartoDB/cartodb/pull/16367)
+- Add a new rake to update a user username [#16370](https://github.com/CartoDB/cartodb/pull/16370)
 
 4.45.0 (2021-04-14)
 -------------------

lib/assets/javascripts/builder/components/modals/publish/create-privacy-options.js

@@ -57,8 +57,7 @@ module.exports = function (visDefinitionModel, userModel) {
 
       var publicMustBeDisabled = (option.privacy !== 'PRIVATE' && publicSharingIsDisabled);
 
-      var enabled = (option.alwaysEnabled || premiumEnabled) && !publicMustBeDisabled;
-
+      var enabled = ((option.alwaysEnabled || premiumEnabled) && !publicMustBeDisabled) || option.privacy === 'PRIVATE';
       return _.defaults({
         selected: option.privacy === currentPrivacy,
         disabled: !enabled

lib/tasks/user_username_change.rake

@@ -0,0 +1,42 @@
+namespace :cartodb do
+  namespace :user do
+    desc 'Change user username'
+    task :change_username, [:old_username, :new_username] => :environment do |_task, args|
+      raise "You must pass an existing username, and a new username for the existing user" unless args[:old_username] && args[:new_username]
+
+      user = User.find(username: args[:old_username])
+      raise "User with username #{args[:old_username]} doesn't exist!" unless user
+
+      # Update username and database_schema
+      user.username = args[:new_username]
+      user.database_schema = args[:new_username]
+      user.save
+
+      # Update Redis metadata
+      user.save_metadata
+
+      # Rename user and database schema
+      user.in_database(as: :superuser) { |db|
+        db.run("ALTER SCHEMA \"#{args[:old_username]}\" RENAME TO \"#{args[:new_username]}\";")
+      }
+
+      # Regenerate API Keys
+      user.carto_user.api_keys.find(&:master?).try(:regenerate_token!)
+
+      # Fix map analysis
+      user.carto_user.tables.each do |table|
+        table.dependent_visualizations.each do |visualization|
+          visualization.analyses.each do |analysis|
+            analysis.update_table_name(
+              "#{args[:old_username]}.#{table.name}",
+              "\"#{args[:new_username]}\".#{table.name}"
+            )
+          end
+        end
+      end
+
+      # Fix public maps
+      Carto::Visualization.where(type: 'derived', user: user.carto_user).select(&:published?).each { |visualization| visualization.create_mapcap! }
+    end
+  end
+end

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.275",
+  "version": "1.0.0-assets.277",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.275",
+  "version": "1.0.0-assets.277",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",