merge master

NEWS.md

@@ -12,6 +12,7 @@ Development
 - Improve concurrent Ghost Tables syncs handling ([#15272](https://github.com/CartoDB/cartodb/pull/15272))
 - Fix consent screen in OAuth apps without user ([#15247](https://github.com/CartoDB/cartodb/pull/15247))
 - Migrate old industry values to new ones ([#15273](https://github.com/CartoDB/cartodb/pull/15273)
+- Update user industries options with the allowed values from Hubspot ([#15265](https://github.com/CartoDB/cartodb/pull/15265))
 - ArcGIS connector: Stop skipping ids on failure
 
 4.31.0 (2019-11-19)

lib/assets/javascripts/dashboard/views/profile/profile-form/profile-form-view.js

@@ -23,10 +23,11 @@ const REQUIRED_OPTS = [
 // These lists must match the options of the correspondant Hubspot enumeration properties. They can be retrieved from:
 // https://api.hubapi.com/properties/v1/contacts/properties/named/industry?hapikey=KEY
 const INDUSTRIES = [
-  'Apparel & Fashion', 'Banking & Financial Services', 'Business Services', 'Consulting Services',
+  'Architecture, Engineering and Construction', 'Banking and Financial Services', 'Cities and Government',
-  'Consumer & Retail', 'Education & Research', 'Energy & Mining', 'Government', 'Health & Medical', 'Insurance',
+  'Consulting', 'CPG', 'Education and Research', 'Health and Medical', 'Insurance', 'Journalism and Media',
-  'Manufacturing', 'Marketing & Advertising', 'Natural Resources & Environment', 'Non-Profit', 'Other', 'Real Estate',
+  'Manufacturing', 'Marketing and Advertising', 'Mining', 'Natural Resources and Environment', 'Non-Profit',
-  'Software & Technology', 'Transportation & Logistics', 'Utilities & Communications'
+  'Real Estate', 'Retail', 'Software and Tech', 'Sports and Entertainment', 'Telecommunications',
+  'Transport and Logistics', 'Utilities', 'Other'
 ];
 
 const COMPANY_EMPLOYEES_RANGES = ['1-5', '5-25', '25-50', '50-100', '100-500', '500-1000', '1000+'];

lib/assets/test/spec/dashboard/views/profile/profile-form-view.spec.js

@@ -119,7 +119,7 @@ describe('dashboard/views/profile/profile-form/profile-form-view', function () {
 
       // Industry
       const industryDropdown = view.$('#user_industry');
-      expect(industryDropdown.find('option').length).toBe(21);
+      expect(industryDropdown.find('option').length).toBe(24);
       expect(industryDropdown.find('option:checked').text()).toContain(INDUSTRY);
     });
 

package-lock.json

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

package.json

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