From 42e862290fd6250a3357413ad4b41a7974078f69 Mon Sep 17 00:00:00 2001 From: alejandraarri Date: Fri, 20 Mar 2020 17:28:36 +0100 Subject: [PATCH] Move the is_enterprise property in /me into user_data --- app/controllers/carto/api/user_presenter.rb | 3 ++- app/controllers/carto/api/users_controller.rb | 1 - app/views/carto/builder/visualizations/show.html.erb | 1 - lib/assets/javascripts/builder/data/user-model.js | 6 +----- lib/assets/javascripts/builder/editor.js | 2 -- lib/assets/javascripts/dashboard/data/user-model.js | 6 +----- .../new-dashboard/plugins/backbone/backbone-core-models.js | 7 ++----- package.json | 2 +- 8 files changed, 7 insertions(+), 21 deletions(-) diff --git a/app/controllers/carto/api/user_presenter.rb b/app/controllers/carto/api/user_presenter.rb index 7d13371626..975a4c6e42 100644 --- a/app/controllers/carto/api/user_presenter.rb +++ b/app/controllers/carto/api/user_presenter.rb @@ -242,7 +242,8 @@ module Carto disqus_shortname: @user.disqus_shortname, available_for_hire: @user.available_for_hire, location: @user.location, - mfa_configured: @user.multifactor_authentication_configured? + mfa_configured: @user.multifactor_authentication_configured?, + is_enterprise: @user.enterprise? } if @user.google_maps_geocoder_enabled? && (!@user.organization.present? || @user.organization_owner?) diff --git a/app/controllers/carto/api/users_controller.rb b/app/controllers/carto/api/users_controller.rb index 20ec696f17..c3dec415de 100644 --- a/app/controllers/carto/api/users_controller.rb +++ b/app/controllers/carto/api/users_controller.rb @@ -61,7 +61,6 @@ module Carto can_change_password: carto_viewer.try(:can_change_password?), plan_name: carto_viewer.present? ? plan_name(carto_viewer.account_type) : nil, plan_url: carto_viewer.try(:plan_url, request.protocol), - is_enterprise: carto_viewer&.enterprise?, can_be_deleted: can_be_deleted, cant_be_deleted_reason: cant_be_deleted_reason, services: carto_viewer.try(:get_oauth_services), diff --git a/app/views/carto/builder/visualizations/show.html.erb b/app/views/carto/builder/visualizations/show.html.erb index b59fd96e18..3733b2f3b4 100644 --- a/app/views/carto/builder/visualizations/show.html.erb +++ b/app/views/carto/builder/visualizations/show.html.erb @@ -19,7 +19,6 @@ var dashboardNotifications = <%= safe_js_object @dashboard_notifications.to_json %>; var ACTIVE_LOCALE = 'en'; var geocoderConfiguration = <%= safe_js_object geocoder_config.to_json %>; - var isEnterprise = <%= safe_js_object @isEnterprise.to_json %>; <% if @visualization.map.provider == 'googlemaps' %> diff --git a/lib/assets/javascripts/builder/data/user-model.js b/lib/assets/javascripts/builder/data/user-model.js index f9cedcc520..f3f8b76444 100755 --- a/lib/assets/javascripts/builder/data/user-model.js +++ b/lib/assets/javascripts/builder/data/user-model.js @@ -47,10 +47,6 @@ var UserModel = Backbone.Model.extend({ }); }, - setEnterprise: function (isEnterprise) { - this.enterprise = isEnterprise; - }, - // Type of user isViewer: function () { return this.get('viewer') === true; @@ -88,7 +84,7 @@ var UserModel = Backbone.Model.extend({ // Plan-related isEnterprise: function () { - return this.enterprise; + return this.get('is_enterprise'); }, isIndividualUser: function () { diff --git a/lib/assets/javascripts/builder/editor.js b/lib/assets/javascripts/builder/editor.js index e68575f7d2..c46db8f7e5 100755 --- a/lib/assets/javascripts/builder/editor.js +++ b/lib/assets/javascripts/builder/editor.js @@ -85,7 +85,6 @@ var builderNotifications = window.builderNotifications; var mapcapsData = window.mapcapsData; var overlaysData = window.overlaysData; var basemaps = window.basemaps; -var isEnterprise = window.isEnterprise; var configModel = new ConfigModel( _.defaults( @@ -107,7 +106,6 @@ var onboardingNotification = new UserNotifications(builderNotifications, { var userModel = new UserModel(userData, { configModel: configModel }); -userModel.setEnterprise(isEnterprise); var editorModel = new EditorModel(); diff --git a/lib/assets/javascripts/dashboard/data/user-model.js b/lib/assets/javascripts/dashboard/data/user-model.js index 8ac1eaa70e..2dc86f2978 100644 --- a/lib/assets/javascripts/dashboard/data/user-model.js +++ b/lib/assets/javascripts/dashboard/data/user-model.js @@ -44,10 +44,6 @@ const UserModel = Backbone.Model.extend({ } }, - setEnterprise: function (isEnterprise) { - this.enterprise = isEnterprise; - }, - isInsideOrg: function () { if (this.organization) { return this.organization.id !== false || this.isOrgOwner(); @@ -85,7 +81,7 @@ const UserModel = Backbone.Model.extend({ }, isEnterprise: function () { - return this.enterprise; + return this.get('is_enterprise'); }, isIndividualUser: function () { diff --git a/lib/assets/javascripts/new-dashboard/plugins/backbone/backbone-core-models.js b/lib/assets/javascripts/new-dashboard/plugins/backbone/backbone-core-models.js index 3ba4e39689..ee6dafdbbe 100644 --- a/lib/assets/javascripts/new-dashboard/plugins/backbone/backbone-core-models.js +++ b/lib/assets/javascripts/new-dashboard/plugins/backbone/backbone-core-models.js @@ -24,7 +24,7 @@ const configModel = new ConfigModel({ ...CARTOData.config, base_url: CARTOData.user_data.base_url }); -const userModel = configureUserModel(CARTOData); +const userModel = configureUserModel(CARTOData.user_data); const backgroundPollingModel = new BackgroundPollingModel({ showGeocodingDatasetURLButton: true, @@ -38,8 +38,7 @@ Vue.use(BackboneCoreModels, { backgroundPolling: backgroundPollingModel }); -function configureUserModel (CARTOData) { - const userData = CARTOData.user_data; +function configureUserModel (userData) { const userModel = new UserModel(userData); if (userData.organization) { @@ -50,7 +49,5 @@ function configureUserModel (CARTOData) { userModel.setGroups(new UserGroupsCollection(userData.groups, { configModel })); } - userModel.setEnterprise(CARTOData.is_enterprise); - return userModel; } diff --git a/package.json b/package.json index a4c0bb23e0..cdddf1d2d0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.166-req-connector-1", + "version": "1.0.0-assets.166-req-connector-2", "description": "CARTO UI frontend", "repository": { "type": "git",