More Space#feature_enabled?

Author: fbacall

app/controllers/communities_controller.rb

@@ -8,9 +8,9 @@ def show
     @resources = []
     if TeSS::Config.solr_enabled
       enabled = []
-      enabled.append(Event) if TeSS::Config.feature['events']
-      enabled.append(Material) if TeSS::Config.feature['materials']
-      enabled.append(Collection) if TeSS::Config.feature['collections']
+      enabled.append(Event) if Space.current_space.feature_enabled?('events')
+      enabled.append(Material) if Space.current_space.feature_enabled?('materials')
+      enabled.append(Collection) if Space.current_space.feature_enabled?('collections')
       enabled.each do |resource|
         @resources += resource.search_and_filter(nil, '', { 'max_age' => '1 month' },
                                                  sort_by: 'new', per_page: 5).results

app/controllers/materials_controller.rb

@@ -17,7 +17,7 @@ class MaterialsController < ApplicationController
   # GET /materials.json?q=queryparam
 
   def index
-    elearning = @facet_params[:resource_type] == 'e-learning' && TeSS::Config.feature['elearning_materials']
+    elearning = @facet_params[:resource_type] == 'e-learning' && Space.current_space.feature_enabled?('elearning_materials')
     @bioschemas = @materials.flat_map(&:to_bioschemas)
     respond_to do |format|
       format.html { render elearning ? 'elearning_materials/index' : 'index' }

app/controllers/search_controller.rb

@@ -54,11 +54,11 @@ def search_params
   def search_models
     return @_models if @_models
     @_models = ['User']
-    @_models << 'Event' if TeSS::Config.feature['events']
-    @_models << 'Material' if TeSS::Config.feature['materials']
-    @_models << 'Collection' if TeSS::Config.feature['collections']
-    @_models << 'ContentProvider' if TeSS::Config.feature['content_providers']
-    @_models << 'Trainer' if TeSS::Config.feature['trainers']
+    @_models << 'Event' if Space.current_space.feature_enabled?('events')
+    @_models << 'Material' if Space.current_space.feature_enabled?('materials')
+    @_models << 'Collection' if Space.current_space.feature_enabled?('collections')
+    @_models << 'ContentProvider' if Space.current_space.feature_enabled?('content_providers')
+    @_models << 'Trainer' if Space.current_space.feature_enabled?('trainers')
     @_models
   end
 end

app/controllers/static_controller.rb

@@ -9,9 +9,9 @@ def home
     @resources = []
     if TeSS::Config.solr_enabled
       enabled = []
-      enabled.append(Event) if TeSS::Config.feature['events']
-      enabled.append(Material) if TeSS::Config.feature['materials']
-      enabled.append(Collection) if TeSS::Config.feature['collections']
+      enabled.append(Event) if Space.current_space.feature_enabled?('events')
+      enabled.append(Material) if Space.current_space.feature_enabled?('materials')
+      enabled.append(Collection) if Space.current_space.feature_enabled?('collections')
       enabled.each do |resource|
         @resources += resource.search_and_filter(nil, '', { 'max_age' => '1 month' },
                                                  sort_by: 'new', per_page: 5).results

app/models/event.rb

@@ -203,8 +203,8 @@ def self.facet_fields
     field_list.delete('sponsors') if TeSS::Config.feature['disabled'].include? 'sponsors'
     field_list.delete('tools') if TeSS::Config.feature['disabled'].include? 'biotools'
     field_list.delete('fields') if TeSS::Config.feature['disabled'].include? 'ardc_fields_of_research'
-    field_list.delete('node') unless TeSS::Config.feature['nodes']
-    field_list.delete('collections') unless TeSS::Config.feature['collections']
+    field_list.delete('node') unless Space.current_space.feature_enabled?('nodes')
+    field_list.delete('collections') unless Space.current_space.feature_enabled?('collections')
     field_list.delete('organizer') unless TeSS::Config.feature['organizer']
     field_list.delete('contact') unless TeSS::Config.feature['contact']
 

app/models/learning_path.rb

@@ -96,7 +96,7 @@ def self.facet_fields
                     difficulty_level licence target_audience authors contributors user node status)
 
     field_list.delete('scientific_topics') if TeSS::Config.feature['disabled'].include? 'topics'
-    field_list.delete('node') unless TeSS::Config.feature['nodes']
+    field_list.delete('node') unless Space.current_space.feature_enabled?('nodes')
     field_list.delete('status') if TeSS::Config.feature['disabled'].include? 'status'
 
     field_list

app/models/material.rb

@@ -140,8 +140,8 @@ def self.facet_fields
     field_list.delete('standard_database_or_policy') if TeSS::Config.feature['disabled'].include? 'fairshare'
     field_list.delete('tools') if TeSS::Config.feature['disabled'].include? 'biotools'
     field_list.delete('fields') if TeSS::Config.feature['disabled'].include? 'ardc_fields_of_research'
-    field_list.delete('node') unless TeSS::Config.feature['nodes']
-    field_list.delete('collections') unless TeSS::Config.feature['collections']
+    field_list.delete('node') unless Space.current_space.feature_enabled?('nodes')
+    field_list.delete('collections') unless Space.current_space.feature_enabled?('collections')
     field_list.delete('status') if TeSS::Config.feature['disabled'].include? 'status'
 
     field_list

app/models/source.rb

@@ -74,7 +74,7 @@ def ingestor_class
 
   def self.facet_fields
     field_list = %w( content_provider node method enabled approval_status )
-    field_list.delete('node') unless TeSS::Config.feature['nodes']
+    field_list.delete('node') unless Space.current_space.feature_enabled?('nodes')
     field_list
   end
 

app/views/about/developers.erb

@@ -96,7 +96,7 @@
           <% end %>
 
           <!-- Workflows -->
-          <% if TeSS::Config.feature['workflows'] %>
+          <% if Space.current_space.feature_enabled?('workflows') %>
             <code>
               <a href="<%= TeSS::Config.base_url %><%== t 'developer.api_example_5' %>">
                 <%= TeSS::Config.base_url %><%== t 'developer.api_example_5' %> </a>

app/views/about/tess.html.erb

@@ -83,7 +83,7 @@
       <% end %>
 
       <!-- WORKFLOWS -->
-      <% if TeSS::Config.feature['workflows'] %>
+      <% if Space.current_space.feature_enabled?('workflows') %>
         <div id="workflows" class="row <%= next_about_block(@feature_count += 1) %>">
           <h3 class="col-lg-12"><%= t('about.headings.workflows') %></h3>
           <div class="col-lg-2 col-lg-push-10 about-resource-icon">