data library feature_flag => config

app/controllers/admin/visualizations_controller.rb

@@ -34,6 +34,8 @@ class Admin::VisualizationsController < Admin::AdminController
 
   before_filter :resolve_visualization_and_table_if_not_cached, only: [:embed_map]
 
+  before_filter :get_data_library_config, only: [:public_table]
+
   skip_before_filter :browser_is_html5_compliant?, only: [:public_map, :embed_map, :track_embed,
                                                           :show_protected_embed_map, :show_protected_public_map]
   skip_before_filter :verify_authenticity_token, only: [:show_protected_public_map, :show_protected_embed_map]
@@ -176,8 +178,6 @@ class Admin::VisualizationsController < Admin::AdminController
     # Public export API SQL url
     @export_sql_api_url = "#{ sql_api_url("SELECT * FROM #{ @table.owner.sql_safe_database_schema }.#{ @table.name }", @user) }&format=shp"
 
-    @data_library_url = CartoDB.data_library_path.nil? ? nil : "#{request.protocol}#{CartoDB.account_host}#{CartoDB.data_library_path}"
-
     respond_to do |format|
       format.html { render 'public_dataset', layout: 'application_table_public' }
     end
@@ -679,4 +679,10 @@ class Admin::VisualizationsController < Admin::AdminController
     @viewed_user = ::User.where(username: username).first
   end
 
+  def get_data_library_config
+    @data_library_username = Cartodb.config[:data_library].present? && !Cartodb.config[:data_library]['username'].blank? ? Cartodb.config[:data_library]['username'] : nil
+    @data_library_name_or_name = @data_library_username.nil? ? @name : "Data Library"
+    @data_library_url_or_url = Cartodb.config[:data_library].present? && !Cartodb.config[:data_library]['path'].blank? ? "#{request.protocol}#{CartoDB.account_host}#{Cartodb.config[:data_library]['path']}" : CartoDB.url(self, 'public_user_feed_home', {}, @visualization.user)
+  end
+
 end

app/controllers/data_library_controller.rb

@@ -7,7 +7,7 @@ class DataLibraryController < ApplicationController
   before_filter :get_viewed_user
 
   def index
-    render_404 and return if @viewed_user.nil? || !@viewed_user.has_feature_flag?("data_library")
+    render_404 and return if @viewed_user.nil? || (Cartodb.config[:data_library] && Cartodb.config[:data_library]['path'].blank?)
 
     @dataset_base_url = (Rails.env.production? || Rails.env.staging?) ? "#{request.protocol}#{CartoDB.account_host}/dataset/" : "#{@viewed_user.public_url(nil, request.protocol == "https://" ? "https" : "http")}/tables/"
 

app/views/admin/visualizations/public_dataset.html.erb

@@ -100,40 +100,26 @@
         <div class="PublicMap-gradient"></div>
 
         <div class="PublicMap-leftBlock PublicMap-leftBlock--owner">
-          <% if @viewed_user.has_feature_flag?("data_library") && @data_library_url %>
-            <ul class="Navmenu-list Navmenu-list--owner Navmenu-list--avatar">
-              <li class="Navmenu-item">
-                <a href="<%= @data_library_url %>" class="UserAvatar">
-                  <img class="UserAvatar-img--medium" src="<%= @visualization.user.avatar %>" alt="Data Library" title="Data Library" />
-                </a>
-              </li>
-            </ul>
-
-            <ul class="Navmenu-list Navmenu-list--owner">
-              <li class="Navmenu-item u-hideOnTablet last-child">
-                <a href="<%= @data_library_url %>" class="Navmenu-link Navmenu-link--owner" title="Data Library">Data Library</a>
-              </li>
-            </ul>
-          <% else %>
-            <ul class="Navmenu-list Navmenu-list--owner Navmenu-list--avatar">
-              <li class="Navmenu-item">
-                <a href="<%= CartoDB.url(self, 'public_user_feed_home', {}, @visualization.user) %>" class="UserAvatar">
-                  <img class="UserAvatar-img--medium" src="<%= @visualization.user.avatar %>" alt="<%= @name %>" title="<%= @name %>" />
-                </a>
-              </li>
-            </ul>
+          <ul class="Navmenu-list Navmenu-list--owner Navmenu-list--avatar">
+            <li class="Navmenu-item">
+              <a href="<%= @data_library_url_or_url %>" class="UserAvatar">
+                <img class="UserAvatar-img--medium" src="<%= @visualization.user.avatar %>" alt="<%= @data_library_name_or_name %>" title="<%= @data_library_name_or_name %>" />
+              </a>
+            </li>
+          </ul>
 
-            <ul class="Navmenu-list Navmenu-list--owner">
-              <li class="Navmenu-item u-hideOnTablet last-child">
-                <a href="<%= CartoDB.url(self, 'public_user_feed_home', {}, @visualization.user) %>" class="Navmenu-link Navmenu-link--owner" title="<%= @name %>"><%= @name %></a>
-              </li>
+          <ul class="Navmenu-list Navmenu-list--owner">
+            <li class="Navmenu-item u-hideOnTablet last-child">
+              <a href="<%= @data_library_url_or_url %>" class="Navmenu-link Navmenu-link--owner" title="<%= @data_library_name_or_name %>"><%= @data_library_name_or_name %></a>
+            </li>
 
+            <% unless @data_library_username %>
               <li class="Navmenu-item">
                 <i class="Navmenu-rarrow iconFont iconFont-Rarrow"></i>
                 <a href="<%= CartoDB.url(self, 'public_datasets_home', {}, @visualization.user) %>" class="Navmenu-link">Datasets</a>
               </li>
-            </ul>
-          <% end %>
+            <% end %>
+          </ul>
         </div>
 
         <div class="PublicMap-rightBlock PublicMap-rightBlock--owner u-txt-right">

config/app_config.yml.sample

@@ -17,7 +17,9 @@ defaults: &defaults
   secret_token:       '71c2b25921b84a1cb21c71503ab8fb23'
   account_host:       'localhost.lan:3000'
   account_path:       '/account'
-  data_library_path:  '/data-library'
+  data_library:
+    username:         'common-data'
+    path:             '/data-library'
   disable_file:       '~/disable'
   watcher:
     ttl:              60

config/initializers/carto_db.rb

@@ -230,7 +230,7 @@ module CartoDB
   end
 
   def self.get_data_library_path
-    Cartodb.config[:data_library_path]
+    Cartodb.config[:data_library] && Cartodb.config[:data_library]['path']
   end
 
 end