Add a short helper method for checking features enabled

fbacall · fbacall · commit 42e2013d66f2 · 2025-12-23T10:01:49.000Z
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -96,7 +96,13 @@ def job_status
 
   private
 
-  def feature_enabled?(feature = controller_name)
+  def feature_enabled?(feature)
+    Space.current_space.feature_enabled?(feature)
+  end
+
+  helper_method :feature_enabled?
+
+  def ensure_feature_enabled(feature = controller_name)
     if TeSS::Config.feature.key?(feature) && !TeSS::Config.feature[feature]
       raise ActionController::RoutingError.new('Feature not enabled')
     end
diff --git a/app/controllers/bioschemas_controller.rb b/app/controllers/bioschemas_controller.rb
@@ -1,5 +1,5 @@
 class BioschemasController < ApplicationController
-  before_action -> { feature_enabled?('bioschemas_testing') }
+  before_action -> { ensure_feature_enabled('bioschemas_testing') }
 
   def test
 
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
@@ -1,6 +1,6 @@
 # The controller for actions related to the Collection model
 class CollectionsController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
   before_action :set_collection, only: %i[show edit curate update_curation add_item remove_item update destroy]
   before_action :set_breadcrumbs
 
diff --git a/app/controllers/communities_controller.rb b/app/controllers/communities_controller.rb
@@ -8,9 +8,9 @@ def show
     @resources = []
     if TeSS::Config.solr_enabled
       enabled = []
-      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.append(Event) if feature_enabled?('events')
+      enabled.append(Material) if feature_enabled?('materials')
+      enabled.append(Collection) if feature_enabled?('collections')
       enabled.each do |resource|
         @resources += resource.search_and_filter(nil, '', { 'max_age' => '1 month' },
                                                  sort_by: 'new', per_page: 5).results
diff --git a/app/controllers/content_providers_controller.rb b/app/controllers/content_providers_controller.rb
@@ -1,6 +1,6 @@
 # The controller for actions related to the Content Providers model
 class ContentProvidersController < ApplicationController
-  before_action -> { feature_enabled?('content_providers') }
+  before_action :ensure_feature_enabled
   before_action :set_content_provider, only: %i[show edit update destroy]
   before_action :set_breadcrumbs
 
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
@@ -2,7 +2,7 @@
 
 # The controller for actions related to the Events model
 class EventsController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
   before_action :set_event, only: %i[show edit clone update destroy update_collections add_term reject_term
                                      redirect report update_report add_data reject_data]
   before_action :set_breadcrumbs
diff --git a/app/controllers/learning_path_topics_controller.rb b/app/controllers/learning_path_topics_controller.rb
@@ -1,5 +1,5 @@
 class LearningPathTopicsController < ApplicationController
-  before_action -> { feature_enabled?('learning_paths') }
+  before_action -> { ensure_feature_enabled('learning_paths') }
   before_action :set_topic, only: %i[show edit update destroy]
   before_action :set_breadcrumbs
 
diff --git a/app/controllers/learning_paths_controller.rb b/app/controllers/learning_paths_controller.rb
@@ -1,5 +1,5 @@
 class LearningPathsController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
   before_action :set_learning_path, only: [:show, :edit, :update, :destroy]
   before_action :set_breadcrumbs
 
diff --git a/app/controllers/materials_controller.rb b/app/controllers/materials_controller.rb
@@ -1,6 +1,6 @@
 # The controller for actions related to the Materials model
 class MaterialsController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
   before_action :set_material, only: %i[show edit update destroy update_collections clone
                                         add_term reject_term add_data reject_data]
   before_action :set_breadcrumbs
@@ -17,7 +17,7 @@ class MaterialsController < ApplicationController
   # GET /materials.json?q=queryparam
 
   def index
-    elearning = @facet_params[:resource_type] == 'e-learning' && Space.current_space.feature_enabled?('elearning_materials')
+    elearning = @facet_params[:resource_type] == 'e-learning' && feature_enabled?('elearning_materials')
     @bioschemas = @materials.flat_map(&:to_bioschemas)
     respond_to do |format|
       format.html { render elearning ? 'elearning_materials/index' : 'index' }
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
@@ -1,6 +1,6 @@
 # The controller for actions related to the Nodes model
 class NodesController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
   before_action :set_node, only: [:show, :edit, :update, :destroy]
   before_action :set_breadcrumbs
 
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
@@ -54,11 +54,11 @@ def search_params
   def search_models
     return @_models if @_models
     @_models = ['User']
-    @_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 << 'Event' if feature_enabled?('events')
+    @_models << 'Material' if feature_enabled?('materials')
+    @_models << 'Collection' if feature_enabled?('collections')
+    @_models << 'ContentProvider' if feature_enabled?('content_providers')
+    @_models << 'Trainer' if feature_enabled?('trainers')
     @_models
   end
 end
diff --git a/app/controllers/spaces_controller.rb b/app/controllers/spaces_controller.rb
@@ -1,6 +1,6 @@
 # The controller for actions related to the Spaces model
 class SpacesController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
   before_action :set_space, only: [:show, :edit, :update, :destroy]
   before_action :set_breadcrumbs
 
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
@@ -9,9 +9,9 @@ def home
     @resources = []
     if TeSS::Config.solr_enabled
       enabled = []
-      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.append(Event) if feature_enabled?('events')
+      enabled.append(Material) if feature_enabled?('materials')
+      enabled.append(Collection) if feature_enabled?('collections')
       enabled.each do |resource|
         @resources += resource.search_and_filter(nil, '', { 'max_age' => '1 month' },
                                                  sort_by: 'new', per_page: 5).results
diff --git a/app/controllers/trainers_controller.rb b/app/controllers/trainers_controller.rb
@@ -1,6 +1,6 @@
 # The controller for actions related to the Profiles model
 class TrainersController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
   before_action :set_trainer, only: [:show]
   before_action :set_breadcrumbs
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -2,7 +2,7 @@
 
 # The controller for actions related to the Users model
 class UsersController < ApplicationController
-  before_action -> { feature_enabled?('invitation') }, only: [:invitees]
+  before_action -> { ensure_feature_enabled('invitation') }, only: [:invitees]
   prepend_before_action :set_user, only: %i[show edit update destroy change_token]
   prepend_before_action :init_user, only: [:create]
   before_action :set_breadcrumbs
@@ -139,10 +139,6 @@ def user_params
     params.require(:user).permit(allowed_parameters)
   end
 
-  def invitees_enabled?
-    feature_enabled?('invitation')
-  end
-
   # Prevent assigning other profiles
   def check_profile_id
     profile_id = @user.profile.id
diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb
@@ -1,6 +1,6 @@
 # The controller for actions related to the Workflows model
 class WorkflowsController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
 
   layout 'application'
 
diff --git a/app/views/about/_about_nav.html.erb b/app/views/about/_about_nav.html.erb
@@ -24,7 +24,7 @@
   </ul>
 
   <!-- REGISTERING YOUR LEARNING PATHS -->
-  <% if Space.current_space.feature_enabled?('learning_paths') %>
+  <% if feature_enabled?('learning_paths') %>
     <ul class="nav nav-stacked <%= show_active(show, 'learning_paths') %>">
       <li class="about-page-category">
         <%= link_to t('about.sidebar.learning_paths'), registering_learning_paths_path %>
diff --git a/app/views/about/_links.html.erb b/app/views/about/_links.html.erb
@@ -1,7 +1,7 @@
 <div class="quick-links">
   <%= link_to 'What is ' + TeSS::Config.site['title_short'] + '?', about_path, class: ('selected-tab' if show == 'tess') %>
   | <%= link_to 'How to Register', registering_resources_path, class: ('selected-tab' if show == 'registering') %>
-  <% if Space.current_space.feature_enabled?('learning_paths') %>
+  <% if feature_enabled?('learning_paths') %>
     | <%= link_to 'Learning Paths', registering_learning_paths_path, class: ('selected-tab' if show == 'learning_paths') %>
   <% end %>
   | <%= link_to 'Developers Guide', developers_path, class: ('selected-tab' if show == 'developer') %>
diff --git a/app/views/about/developers.erb b/app/views/about/developers.erb
@@ -72,31 +72,31 @@
 
         <p>
           <!-- Events -->
-          <% if Space.current_space.feature_enabled?('events') %>
+          <% if feature_enabled?('events') %>
             <code>
               <a href="<%= TeSS::Config.base_url %><%== t 'developer.api_example_1' %>">
                 <%= TeSS::Config.base_url %><%== t 'developer.api_example_1' %></a>
             </code><br/>
           <% end %>
 
           <!-- Materials -->
-          <% if Space.current_space.feature_enabled?('materials') %>
+          <% if feature_enabled?('materials') %>
             <code>
               <a href="<%= TeSS::Config.base_url %><%== t 'developer.api_example_3' %>">
                 <%= TeSS::Config.base_url %><%== t 'developer.api_example_3' %> </a>
             </code><br/>
           <% end %>
 
           <!-- Providers -->
-          <% if Space.current_space.feature_enabled?('content_providers') %>
+          <% if feature_enabled?('content_providers') %>
             <code>
               <a href="<%= TeSS::Config.base_url %><%== t 'developer.api_example_4' %>">
                 <%= TeSS::Config.base_url %><%== t 'developer.api_example_4' %> </a>
             </code><br/>
           <% end %>
 
           <!-- Workflows -->
-          <% if Space.current_space.feature_enabled?('workflows') %>
+          <% if 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>
diff --git a/app/views/about/tess.html.erb b/app/views/about/tess.html.erb
@@ -38,7 +38,7 @@
       <% @feature_count = 0 %>
 
       <!-- EVENTS-->
-      <% if Space.current_space.feature_enabled?('events') %>
+      <% if feature_enabled?('events') %>
         <div id="events" class="row <%= next_about_block(@feature_count += 1) %>">
           <h3 class="col-lg-12"><%= t('about.headings.events') %></h3>
           <div class="col-lg-2 col-lg-push-10 about-resource-icon">
@@ -59,7 +59,7 @@
       <% end %>
 
       <!-- MATERIALS-->
-      <% if Space.current_space.feature_enabled?('materials') %>
+      <% if feature_enabled?('materials') %>
         <div id="materials" class="row <%= next_about_block(@feature_count += 1) %>">
           <h3 class="col-lg-12"><%= t('about.headings.materials') %></h3>
 
@@ -83,7 +83,7 @@
       <% end %>
 
       <!-- WORKFLOWS -->
-      <% if Space.current_space.feature_enabled?('workflows') %>
+      <% if 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">
diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb
@@ -11,11 +11,11 @@
           <%= render partial: 'collaborations/collaborators_button', locals: { resource: @collection } %>
         <% end %>
         <% if TeSS::Config.feature['collection_curation'] && current_user && policy(@collection).curate? %>
-          <% if Space.current_space.feature_enabled?('events') %>
+          <% if feature_enabled?('events') %>
             <%= link_to t('.curate_events', default: [:'helpers.links.events', 'events']),
                         curate_events_collection_path(@collection), class: 'btn btn-default' %>
           <% end %>
-          <% if Space.current_space.feature_enabled?('materials') %>
+          <% if feature_enabled?('materials') %>
             <%= link_to t('.curate_materials', default: [:'helpers.links.materials', 'materials']),
                         curate_materials_collection_path(@collection), class: 'btn btn-default' %>
           <% end %>
@@ -33,12 +33,12 @@
       <% not_finished_events_count = e.not_finished.count %>
       <% activator = tab_activator %>
       <ul class="nav nav-tabs">
-        <% if Space.current_space.feature_enabled?('materials') %>
+        <% if feature_enabled?('materials') %>
           <%= tab('Materials', icon_class_for_model('materials'), 'materials', activator: activator,
                   disabled: { check: materials_count.zero?, message: 'No registered training materials' },
                   count: materials_count) %>
         <% end %>
-        <% if Space.current_space.feature_enabled?('events') %>
+        <% if feature_enabled?('events') %>
           <%= tab('Events', icon_class_for_model('events'), 'events', activator: activator,
                   disabled: { check: events_count.zero?, message: 'No associated events' },
                   count: not_finished_events_count.zero? && events_count.positive? ? '0*' : not_finished_events_count) %>
@@ -47,7 +47,7 @@
     </div>
 
     <div class="tab-content ml-3">
-      <% if Space.current_space.feature_enabled?('materials') %>
+      <% if feature_enabled?('materials') %>
         <%= render partial: 'common/associated_resources',
                    locals: { model: Material,
                              total_count: materials_count,
@@ -56,7 +56,7 @@
                              view_all_link: materials_path(collections: @collection.title) } %>
       <% end %>
 
-      <% if Space.current_space.feature_enabled?('events') %>
+      <% if feature_enabled?('events') %>
         <%= render partial: 'common/associated_events',
                    locals: { total_count: events_count,
                              resources: event_items,
diff --git a/app/views/content_providers/_form.html.erb b/app/views/content_providers/_form.html.erb
@@ -37,7 +37,7 @@
   <%= f.multi_input :keywords %>
 
   <!-- Nodes: check feature enabled -->
-  <% if Space.current_space.feature_enabled?('nodes') %>
+  <% if feature_enabled?('nodes') %>
     <%= f.input :node_id, label: 'ELIXIR node', collection: Node.order(:name).all, label_method: :name %>
   <% end %>
 
diff --git a/app/views/content_providers/partials/_content_provider_sidebar.html.erb b/app/views/content_providers/partials/_content_provider_sidebar.html.erb
@@ -10,7 +10,7 @@
     <%= content_provider.keywords.join(', ') %>
   </div>
 <% end %>
-<% unless content_provider.node.blank? || !Space.current_space.feature_enabled?('nodes') %>
+<% unless content_provider.node.blank? || !feature_enabled?('nodes') %>
   <h4 class="nav-heading">ELIXIR node</h4>
   <div class="nav-block">
     <p>
diff --git a/app/views/content_providers/show.html.erb b/app/views/content_providers/show.html.erb
@@ -32,12 +32,12 @@
       <% sources = @content_provider.sources.order(enabled: :desc, finished_at: :desc) %>
       <% activator = tab_activator %>
       <ul class="nav nav-tabs">
-        <% if Space.current_space.feature_enabled?('materials') %>
+        <% if feature_enabled?('materials') %>
           <%= tab('Materials', icon_class_for_model('materials'), 'materials', activator: activator,
                   disabled: { check: materials_count.zero?, message: 'No registered training materials' },
                   count: materials_count) %>
         <% end %>
-        <% if Space.current_space.feature_enabled?('events') %>
+        <% if feature_enabled?('events') %>
           <%= tab('Events', icon_class_for_model('events'), 'events', activator: activator,
                   disabled: { check: events_count.zero?, message: 'No associated events' },
                   count: not_finished_events_count.zero? && events_count.positive? ? '0*' : not_finished_events_count) %>
@@ -49,7 +49,7 @@
       </ul>
 
       <div class="tab-content">
-        <% if Space.current_space.feature_enabled?('materials') %>
+        <% if feature_enabled?('materials') %>
           <%= render partial: 'common/associated_resources',
                      locals: { model: Material,
                                total_count: materials_count,
@@ -59,7 +59,7 @@
                                view_all_link: materials_path(content_provider: @content_provider.title) } %>
         <% end %>
 
-        <% if Space.current_space.feature_enabled?('events') %>
+        <% if feature_enabled?('events') %>
           <%= render partial: 'common/associated_events',
                      locals: { total_count: upcoming_events.count,
                                past_count: past_events.count,
diff --git a/app/views/events/_form.html.erb b/app/views/events/_form.html.erb
@@ -157,7 +157,7 @@
   <!-- Fields: that need to be check for enabled/disabled -->
 
   <!-- Nodes: check feature enabled -->
-  <% if Space.current_space.feature_enabled?('nodes') %>
+  <% if feature_enabled?('nodes') %>
     <%= f.dropdown :node_ids, options: format_for_dropdown(Node.order(:name).all), label: 'Nodes',
                    errors: @event.errors[:node_ids] %>
   <% end %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
@@ -54,7 +54,7 @@
             { feature: 'nodes', link: nodes_path },
             { feature: 'spaces', link: spaces_path }
           ].select do |t|
-            t[:feature] == 'about' || Space.current_space.feature_enabled?(t[:feature])
+            t[:feature] == 'about' || feature_enabled?(t[:feature])
           end.sort_by do |t|
             TeSS::Config.site['tab_order'].index(t[:feature]) || 99
           end
diff --git a/app/views/learning_path_topics/show.html.erb b/app/views/learning_path_topics/show.html.erb
diff --git a/app/views/learning_paths/_form.html.erb b/app/views/learning_paths/_form.html.erb
diff --git a/app/views/materials/_form.html.erb b/app/views/materials/_form.html.erb
diff --git a/app/views/nodes/partials/_associated_node_info.html.erb b/app/views/nodes/partials/_associated_node_info.html.erb
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
diff --git a/app/views/static/home/_catalogue_blocks.html.erb b/app/views/static/home/_catalogue_blocks.html.erb
diff --git a/app/views/static/home/_provider_carousel.html.erb b/app/views/static/home/_provider_carousel.html.erb
diff --git a/app/views/trainers/index.html.erb b/app/views/trainers/index.html.erb
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
