From 372cfc1e6d6f0e98df0a1ed0a59e752da9424aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Calzado?= Date: Mon, 20 Dec 2021 19:13:31 +0100 Subject: [PATCH 01/10] Add check before destroying dependent visualizations --- app/models/carto/user_table.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/carto/user_table.rb b/app/models/carto/user_table.rb index 9e385d2f2f..c618519871 100644 --- a/app/models/carto/user_table.rb +++ b/app/models/carto/user_table.rb @@ -13,6 +13,8 @@ end module Carto class UserTable < ActiveRecord::Base + attr_accessor :skip_destroy_dependent_visualizations + PRIVACY_PRIVATE = 0 PRIVACY_PUBLIC = 1 PRIVACY_LINK = 2 @@ -68,7 +70,7 @@ module Carto before_destroy :ensure_not_viewer before_destroy :cache_dependent_visualizations, unless: :destroyed? before_destroy :backup_visualizations, unless: :destroyed? - after_destroy :destroy_dependent_visualizations + after_destroy :destroy_dependent_visualizations, unless: :skip_destroy_dependent_visualizations after_destroy :service_after_destroy def geometry_types From b8f628e1e3ee956bb12ce1250dca9abefa8d7a0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Calzado?= Date: Mon, 20 Dec 2021 19:16:03 +0100 Subject: [PATCH 02/10] Update NEWS.md --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index 0eba588e4f..248580cdd9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -78,6 +78,7 @@ Development - 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) +- Add a check before destroying user tables in order to avoid deleting dependent maps [#16381](https://github.com/CartoDB/cartodb/pull/16381) 4.45.0 (2021-04-14) ------------------- From 1dc58a2f82f0bba105cdbcbfaac5d5cbd6522a86 Mon Sep 17 00:00:00 2001 From: Javier Villar Date: Tue, 21 Dec 2021 11:49:17 +0100 Subject: [PATCH 03/10] Test rubocop 1.12.0 version --- .github/workflows/rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index 1aa0eb9a1e..47018be88d 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -14,7 +14,7 @@ jobs: - name: Rubocop linter uses: reviewdog/action-rubocop@v1 with: - rubocop_version: 1.12.1 + rubocop_version: 1.12.0 github_token: ${{ secrets.github_token }} reporter: github-pr-check level: error From 2c1daace08d0aceb2ee6574b95d6b6d766f9b0cd Mon Sep 17 00:00:00 2001 From: Javier Villar Date: Tue, 21 Dec 2021 12:04:29 +0100 Subject: [PATCH 04/10] Test 1.23.0 rubocop version --- .github/workflows/rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index 47018be88d..cdfb9d55e4 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -14,7 +14,7 @@ jobs: - name: Rubocop linter uses: reviewdog/action-rubocop@v1 with: - rubocop_version: 1.12.0 + rubocop_version: 1.23.0 github_token: ${{ secrets.github_token }} reporter: github-pr-check level: error From 854aa6360e80d2a7d039ad67a33587ba113be771 Mon Sep 17 00:00:00 2001 From: Javier Villar Date: Tue, 21 Dec 2021 12:08:36 +0100 Subject: [PATCH 05/10] Test activesupport 6.1.4.4 for rubocop --- .github/workflows/rubocop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index cdfb9d55e4..08928fc114 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -11,6 +11,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: ruby-version: 2.5 + - run: 'gem install activesupport -v 6.1.4.4' - name: Rubocop linter uses: reviewdog/action-rubocop@v1 with: From de19a94ec1d9b13fc114f78304e0405363c3ec72 Mon Sep 17 00:00:00 2001 From: Javier Villar Date: Tue, 21 Dec 2021 12:13:09 +0100 Subject: [PATCH 06/10] Revert "Test activesupport 6.1.4.4 for rubocop" This reverts commit 854aa6360e80d2a7d039ad67a33587ba113be771. --- .github/workflows/rubocop.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index 08928fc114..cdfb9d55e4 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -11,7 +11,6 @@ jobs: - uses: ruby/setup-ruby@v1 with: ruby-version: 2.5 - - run: 'gem install activesupport -v 6.1.4.4' - name: Rubocop linter uses: reviewdog/action-rubocop@v1 with: From 47f2196356c1103f654f7f86b1d95cef239cea84 Mon Sep 17 00:00:00 2001 From: Javier Villar Date: Tue, 21 Dec 2021 12:13:15 +0100 Subject: [PATCH 07/10] Revert "Test 1.23.0 rubocop version" This reverts commit 2c1daace08d0aceb2ee6574b95d6b6d766f9b0cd. --- .github/workflows/rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index cdfb9d55e4..47018be88d 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -14,7 +14,7 @@ jobs: - name: Rubocop linter uses: reviewdog/action-rubocop@v1 with: - rubocop_version: 1.23.0 + rubocop_version: 1.12.0 github_token: ${{ secrets.github_token }} reporter: github-pr-check level: error From e577b90250d2a0155cc5dd1004b69d32f6b35f7e Mon Sep 17 00:00:00 2001 From: Javier Villar Date: Tue, 21 Dec 2021 12:13:20 +0100 Subject: [PATCH 08/10] Revert "Test rubocop 1.12.0 version" This reverts commit 1dc58a2f82f0bba105cdbcbfaac5d5cbd6522a86. --- .github/workflows/rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index 47018be88d..1aa0eb9a1e 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -14,7 +14,7 @@ jobs: - name: Rubocop linter uses: reviewdog/action-rubocop@v1 with: - rubocop_version: 1.12.0 + rubocop_version: 1.12.1 github_token: ${{ secrets.github_token }} reporter: github-pr-check level: error From 7425fe5ce38eb29306cfa7891db8f886a1cd6055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Calzado?= Date: Wed, 22 Dec 2021 17:53:49 +0100 Subject: [PATCH 09/10] Fix rubocop ofensse --- app/models/carto/user_table.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/carto/user_table.rb b/app/models/carto/user_table.rb index c618519871..23e51a5c2a 100644 --- a/app/models/carto/user_table.rb +++ b/app/models/carto/user_table.rb @@ -13,6 +13,7 @@ end module Carto class UserTable < ActiveRecord::Base + attr_accessor :skip_destroy_dependent_visualizations PRIVACY_PRIVATE = 0 From 8729c83a4ef8660af99e1e6ad3180d9b12d22436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Calzado?= Date: Wed, 22 Dec 2021 18:00:10 +0100 Subject: [PATCH 10/10] Fix another rubocop offense --- app/models/carto/user_table.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/carto/user_table.rb b/app/models/carto/user_table.rb index 23e51a5c2a..4014ebc608 100644 --- a/app/models/carto/user_table.rb +++ b/app/models/carto/user_table.rb @@ -13,7 +13,7 @@ end module Carto class UserTable < ActiveRecord::Base - + attr_accessor :skip_destroy_dependent_visualizations PRIVACY_PRIVATE = 0