feature flag for new user_feed

app/controllers/admin/pages_controller.rb

@@ -129,6 +129,7 @@ class Admin::PagesController < Admin::AdminController
       @maps_count         = maps_builder.build.count
       @website            = website_url(@viewed_user.website)
       @website_clean      = @website ? @website.gsub(/https?:\/\//, "") : ""
+      @hasNewDashboard    = @viewed_user.builder_enabled && viewed_user.has_feature_flag?('dashboard_migration')
 
       if eligible_for_redirect?(@viewed_user)
         # redirect username.host.ext => org-name.host.ext/u/username

app/views/layouts/public_user_feed.html.erb

@@ -51,7 +51,11 @@
         el: '#<%= fav_map_target_id %>',
         <% if @most_viewed_vis_map %>
           createVis: {
-            url: '<%= vis_json_v3_url(@most_viewed_vis_map.id, self, (@most_viewed_vis_map.user)) %>',
+            <% if @hasNewDashboard %>
+              url: '<%= vis_json_v3_url(@most_viewed_vis_map.id, self, (@most_viewed_vis_map.user)) %>',
+            <% else %>
+              url: '<%= vis_json_url(@most_viewed_vis_map.id, self, (@most_viewed_vis_map.user)) %>',
+            <% end %>
             opts: {
               no_cdn: <%= Rails.env.production? ? 'false' : 'true' %>
             }
@@ -62,7 +66,11 @@
       };
       </script>
 
-    <%= javascript_include_tag 'common', 'user_feed' %>
+    <% if @hasNewDashboard %>
+      <%= javascript_include_tag 'common_dashboard', 'user_feed_new' %>
+    <% else %>
+      <%= javascript_include_tag 'cdb.js', 'templates', 'user_feed_deps', 'user_feed' %>
+    <% end %>
     <%= yield :js %>
     <%= insert_google_analytics('embeds', true) %>
     <%= insert_hubspot() %>

config/application.rb

@@ -127,6 +127,9 @@ module CartoDB
       user_feed_deps.js
       user_feed.js
 
+      user_feed_new.js
+      common_dashboard.js
+
       tipsy.js
       modernizr.js
       statsc.js

webpack/dashboard/webpack.dev.config.js

@@ -14,7 +14,7 @@ const isVendor = (module, count) => {
 };
 
 const entryPoints = {
-  'user_feed': resolve(__dirname, '../../', 'lib/assets/core/javascripts/dashboard/user-feed.js')
+  user_feed_new: resolve(__dirname, '../../', 'lib/assets/core/javascripts/dashboard/user-feed.js')
 };
 
 module.exports = env => {
@@ -48,7 +48,7 @@ module.exports = env => {
       .concat([
       // Extract common chuncks from the 3 vendor files
         new webpack.optimize.CommonsChunkPlugin({
-          name: 'common',
+          name: 'common_dashboard',
           chunks: Object.keys(entryPoints).map(n => `${n}_vendor`),
           minChunks: (module, count) => {
             return count >= Object.keys(entryPoints).length && isVendor(module);

webpack/dashboard/webpack.prod.config.js

@@ -9,7 +9,7 @@ const isVendor = (module, count) => {
 };
 
 const entryPoints = {
-  'user-feed': resolve(__dirname, '../../', 'lib/assets/core/javascripts/dashboard/user-feed.js')
+  user_feed_new: resolve(__dirname, '../../', 'lib/assets/core/javascripts/dashboard/user-feed.js')
 };
 
 module.exports = env => {
@@ -29,7 +29,7 @@ module.exports = env => {
       .concat([
       // Extract common chuncks from the 3 vendor files
         new webpack.optimize.CommonsChunkPlugin({
-          name: 'common',
+          name: 'common_dashboard',
           chunks: Object.keys(entryPoints).map(n => `${n}_vendor`),
           minChunks: (module, count) => {
             return count >= Object.keys(entryPoints).length && isVendor(module);