Merge branch 'master' into bug/sc-184298/check-migration-process-for-old-plans

NEWS.md

@@ -66,6 +66,9 @@ Development
 - Fix regenerating API Keys for a whole organization [#16336](https://github.com/CartoDB/cartodb/pull/16336)
 - Fix API Keys propagation to Redis function [#16340](https://github.com/CartoDB/cartodb/pull/16340)
 - Fix scrolling on widget's sidebar in builder [#16350](https://github.com/CartoDB/cartodb/pull/16350)
+- 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)
 
 4.45.0 (2021-04-14)
 -------------------

app/models/carto/organization.rb

@@ -140,7 +140,7 @@ module Carto
     end
 
     def notify_if_seat_limit_reached
-      ::Resque.enqueue(::Resque::OrganizationJobs::Mail::SeatLimitReached, id) if will_reach_seat_limit?
+      ::Resque.enqueue(::Resque::OrganizationJobs::Mail::SeatLimitReached, id) if reached_seats_limit?
     end
 
     def database_name
@@ -249,8 +249,8 @@ module Carto
       assets.map { |asset| Carto::Asset.find(asset.id) }.map(&:destroy).all?
     end
 
-    def will_reach_seat_limit?
-      remaining_seats <= 1
+    def reached_seats_limit?
+      remaining_seats < 1
     end
 
     def authentication_methods_available

lib/assets/javascripts/new-dashboard/core/dialog-actions.js

@@ -37,12 +37,10 @@ export function editDatasetMetadata (dataset, actionHandlers) {
   this.showModal(
     {
       template: `
-      <Dialog v-on:close="$emit('close')">
         <DatasetMetadata
           :dataset="dataset"
           @close="$emit('close')"
-          v-on="getEventListeners()" />
-      </Dialog>`,
+          v-on="getEventListeners()" />`,
       props: ['dataset'],
       components: { Dialog, DatasetMetadata },
       methods: {

package-lock.json

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

package.json

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

services/datasources/lib/datasources/url/bigquery.rb

@@ -72,8 +72,8 @@ module CartoDB
         # @return string | nil
         def get_auth_url()
           service_name = service_name_for_user(DATASOURCE_NAME, @user)
-          @client.state = CALLBACK_STATE_DATA_PLACEHOLDER.sub('user', @user.username)
-                                                         .sub('service', service_name)
+          @client.state = CALLBACK_STATE_DATA_PLACEHOLDER.sub('service', service_name)
+                                                         .sub('user', @user.username)
           @client.authorization_uri.to_s
         end
 

services/datasources/lib/datasources/url/box.rb

@@ -332,7 +332,7 @@ module CartoDB
         # @return string | nil
         def get_auth_url
           service_name = service_name_for_user(DATASOURCE_NAME, @user)
-          state = CALLBACK_STATE_DATA_PLACEHOLDER.sub('user', @user.username).sub('service', service_name)
+          state = CALLBACK_STATE_DATA_PLACEHOLDER.sub('service', service_name).sub('user', @user.username)
           BoxAPI::oauth_url(state,
                             host: config['box_host'],
                             response_type: "code",

services/datasources/lib/datasources/url/dropbox.rb

@@ -279,7 +279,7 @@ module CartoDB
 
         def state
           service_name = service_name_for_user(DATASOURCE_NAME, @user)
-          CALLBACK_STATE_DATA_PLACEHOLDER.sub('user', @user.username).sub('service', service_name)
+          CALLBACK_STATE_DATA_PLACEHOLDER.sub('service', service_name).sub('user', @user.username)
         end
       end
     end

services/datasources/lib/datasources/url/gdrive.rb

@@ -77,8 +77,8 @@ module CartoDB
         def get_auth_url(use_callback_flow = true)
           if use_callback_flow
             service_name = service_name_for_user(DATASOURCE_NAME, @user)
-            @client.state = CALLBACK_STATE_DATA_PLACEHOLDER.sub('user', @user.username)
-                                                           .sub('service', service_name)
+            @client.state = CALLBACK_STATE_DATA_PLACEHOLDER.sub('service', service_name)
+                                                           .sub('user', @user.username)
           else
             @client.redirect_uri = REDIRECT_URI
           end

services/datasources/lib/datasources/url/instagram_oauth.rb

@@ -30,7 +30,7 @@ module CartoDB
           raise ServiceDisabledError.new(DATASOURCE_NAME, @user.username) unless @user.has_feature_flag?('instagram_import')
 
           service_name = service_name_for_user(DATASOURCE_NAME, @user)
-          placeholder = CALLBACK_STATE_DATA_PLACEHOLDER.sub('user', @user.username).sub('service', service_name)
+          placeholder = CALLBACK_STATE_DATA_PLACEHOLDER.sub('service', service_name).sub('user', @user.username)
           @callback_url = "#{config.fetch('callback_url')}?state=#{placeholder}"
 
           self.filter   = []

services/datasources/lib/datasources/url/mailchimp.rb

@@ -40,7 +40,7 @@ module CartoDB
           @http_connect_timeout = config.fetch(:http_connect_timeout, 60)
 
           service_name = service_name_for_user(DATASOURCE_NAME, @user)
-          placeholder = CALLBACK_STATE_DATA_PLACEHOLDER.sub('user', @user.username).sub('service', service_name)
+          placeholder = CALLBACK_STATE_DATA_PLACEHOLDER.sub('service', service_name).sub('user', @user.username)
           @callback_url = "#{config.fetch('callback_url')}?state=#{placeholder}"
 
           Gibbon::API.timeout = API_TIMEOUT_SECS