Move the is_enterprise property in /me into user_data

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?)

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),

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 %>;
 </script>
 
 <% if @visualization.map.provider == 'googlemaps' %>

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 () {

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();
 

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 () {

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;
 }

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",