Filter associated resources on various show pages according to current space

Author: fbacall

app/models/concerns/in_space.rb

@@ -15,4 +15,10 @@ def space= s
     return if s.default?
     super
   end
+
+  class_methods do
+    def in_current_space
+      Space.current_space&.default? ? all : where(space_id: Space.current_space&.id)
+    end
+  end
 end

app/models/space.rb

@@ -3,12 +3,12 @@ class Space < ApplicationRecord
   include LogParameterChanges
 
   belongs_to :user
-  has_many :materials
-  has_many :events
-  has_many :workflows
-  has_many :collections
-  has_many :learning_paths
-  has_many :learning_path_topics
+  has_many :materials, dependent: :nullify
+  has_many :events, dependent: :nullify
+  has_many :workflows, dependent: :nullify
+  has_many :collections, dependent: :nullify
+  has_many :learning_paths, dependent: :nullify
+  has_many :learning_path_topics, dependent: :nullify
 
   has_image(placeholder: TeSS::Config.placeholder['content_provider'])
 

app/views/content_providers/show.html.erb

@@ -21,12 +21,12 @@
 
     <div class="my-3">
       <% resource_limit = 30 %>
-      <% materials = @content_provider.materials.from_verified_users.not_disabled.limit(resource_limit) %>
-      <% materials_count =  @content_provider.materials.from_verified_users.not_disabled.count %>
-      <% upcoming_events = @content_provider.events.from_verified_users.not_finished.not_disabled.order(start: :asc) %>
-      <% past_events = @content_provider.events.from_verified_users.finished.not_disabled %>
+      <% materials = @content_provider.materials.in_current_space.from_verified_users.not_disabled.limit(resource_limit) %>
+      <% materials_count =  @content_provider.materials.in_current_space.from_verified_users.not_disabled.count %>
+      <% upcoming_events = @content_provider.events.in_current_space.from_verified_users.not_finished.not_disabled.order(start: :asc) %>
+      <% past_events = @content_provider.events.in_current_space.from_verified_users.finished.not_disabled %>
       <% events = upcoming_events.limit(resource_limit) %>
-      <% e = @content_provider.events.from_verified_users.not_disabled %>
+      <% e = @content_provider.events.in_current_space.from_verified_users.not_disabled %>
       <% events_count = e.count %>
       <% not_finished_events_count = e.not_finished.count %>
       <% sources = @content_provider.sources.order(enabled: :desc, finished_at: :desc) %>

app/views/nodes/show.html.erb

@@ -18,12 +18,12 @@
       <% resource_limit = 30 %>
       <% content_providers = @node.content_providers.from_verified_users.limit(resource_limit) %>
       <% content_providers_count = @node.content_providers.from_verified_users.count %>
-      <% materials = @node.related_materials.from_verified_users.limit(resource_limit) %>
-      <% materials_count =  @node.related_materials.from_verified_users.count %>
-      <% upcoming_events = @node.related_events.from_verified_users.not_finished %>
-      <% past_events = @node.related_events.from_verified_users.finished %>
+      <% materials = @node.related_materials.in_current_space.from_verified_users.limit(resource_limit) %>
+      <% materials_count =  @node.related_materials.in_current_space.from_verified_users.count %>
+      <% upcoming_events = @node.related_events.in_current_space.from_verified_users.not_finished %>
+      <% past_events = @node.related_events.in_current_space.from_verified_users.finished %>
       <% events = upcoming_events.limit(resource_limit) %>
-      <% e = @node.events.from_verified_users.not_disabled %>
+      <% e = @node.events.in_current_space.from_verified_users.not_disabled %>
       <% events_count = e.count %>
       <% not_finished_events_count = e.not_finished.count %>
       <% activator = tab_activator %>

app/views/users/show.html.erb

@@ -126,18 +126,18 @@
     <%= render(partial: 'users/partials/ban', locals: { ban: @user.ban }) if @user.banned? && current_user.try(:is_admin?) %>
 
     <div class="my-3">
-      <% materials = @user.materials.limit(resource_limit) %>
-      <% materials_count =  @user.materials.count %>
-      <% upcoming_events = @user.events.not_finished %>
-      <% past_events = @user.events.finished %>
+      <% materials = @user.materials.in_current_space.limit(resource_limit) %>
+      <% materials_count =  @user.materials.in_current_space.count %>
+      <% upcoming_events = @user.events.in_current_space.not_finished %>
+      <% past_events = @user.events.in_current_space.finished %>
       <% events = upcoming_events.limit(resource_limit) %>
-      <% e = @user.events.from_verified_users.not_disabled %>
+      <% e = @user.events.in_current_space.from_verified_users.not_disabled %>
       <% events_count = e.count %>
       <% not_finished_events_count = e.not_finished.count %>
-      <% workflows = @user.workflows.visible_by(current_user).limit(resource_limit) %>
-      <% workflows_count =  @user.workflows.visible_by(current_user).count %>
-      <% collections = @user.collections.visible_by(current_user).limit(resource_limit) %>
-      <% collections_count = @user.collections.visible_by(current_user).count %>
+      <% workflows = @user.workflows.in_current_space.visible_by(current_user).limit(resource_limit) %>
+      <% workflows_count =  @user.workflows.in_current_space.visible_by(current_user).count %>
+      <% collections = @user.collections.in_current_space.visible_by(current_user).limit(resource_limit) %>
+      <% collections_count = @user.collections.in_current_space.visible_by(current_user).count %>
       <% activator = tab_activator %>
 
       <ul class="nav nav-tabs">

test/controllers/content_providers_controller_test.rb

@@ -587,13 +587,25 @@ class ContentProvidersControllerTest < ActionController::TestCase
     new_material = Material.create!(title: 'my_material', description: 'visible material', url: 'http://new.url.com', content_provider: @content_provider, user: @content_provider.user)
     get :show, params: { id: @content_provider }
     assert_response :success
-    assert_select '.search-results-count.my-3', text: 'Showing 10 materials'
+    not_disabled_material_count = @content_provider.materials.not_disabled.length
+    assert not_disabled_material_count > 1
+    assert_select '.search-results-count.my-3', text: "Showing #{not_disabled_material_count} materials"
     assert_select '.masonry-brick-heading h4', text: 'my_material'
     new_material.visible = false
     new_material.save!
     get :show, params: { id: @content_provider }
     assert_response :success
-    assert_select '.search-results-count.my-3', text: 'Showing 9 materials'
+    assert_select '.search-results-count.my-3', text: "Showing #{not_disabled_material_count - 1} materials"
     assert_select '.masonry-brick-heading h4', text: 'my_material', count: 0
   end
+
+  test 'should only show content for current space on show page' do
+    with_host('plants.mytess.training') do
+      get :show, params: { id: @content_provider }
+      assert_select '.search-results-count.my-3', text: 'Showing 1 material'
+      assert_select '.masonry-brick-heading h4', text: 'Plant material'
+      assert_select '.search-results-count.my-3', text: 'Showing 1 event'
+      assert_select '.masonry-brick-heading h4', text: 'Learn about plants'
+    end
+  end
 end

test/controllers/nodes_controller_test.rb

@@ -239,4 +239,14 @@ class NodesControllerTest < ActionController::TestCase
 
     assert_select 'h4', text: 'No Country Node'
   end
+
+  test 'should only show content for current space on show page' do
+    with_host('plants.mytess.training') do
+      get :show, params: { id: @node }
+      assert_select '.search-results-count.my-3', text: 'Showing 1 material'
+      assert_select '.masonry-brick-heading h4', text: 'Plant material'
+      assert_select '.search-results-count.my-3', text: 'Showing 1 event'
+      assert_select '.masonry-brick-heading h4', text: 'Learn about plants'
+    end
+  end
 end

test/controllers/users_controller_test.rb

@@ -458,4 +458,14 @@ class UsersControllerTest < ActionController::TestCase
     assert_response :success
     refute assigns(:users).include?(users(:basic_user))
   end
+
+  test 'should only show content for current space on show page' do
+    with_host('plants.mytess.training') do
+      get :show, params: { id: @user }
+      assert_select '.search-results-count.my-3', text: 'Showing 1 material'
+      assert_select '.masonry-brick-heading h4', text: 'Plant material'
+      assert_select '.search-results-count.my-3', text: 'Showing 1 event'
+      assert_select '.masonry-brick-heading h4', text: 'Learn about plants'
+    end
+  end
 end

test/fixtures/events.yml

@@ -493,3 +493,14 @@ hybrid_event:
   start: 2024-12-12 10:00:00
   end: 2024-12-12 12:00:00
   timezone: UTC
+
+plant_space_event:
+  title: Learn about plants
+  url: http://example.com/plants/event123
+  description: Plants are very interesting indeed
+  user: regular_user
+  content_provider: goblet
+  start: 2126-12-12 10:00:00
+  end: 2126-12-12 12:00:00
+  timezone: UTC
+  space: plants

test/fixtures/materials.yml

@@ -178,3 +178,15 @@ youtube_video_material:
   resource_type:
     - Video
   learning_objectives: In this video, I will show you how to create and run data quality checks in REDCap.
+
+plant_space_material:
+  user: regular_user
+  title: Plant material
+  slug: plant-material
+  url: http://example.com/plants/material123
+  description: This is a material in the plant space
+  licence: CC-BY-4.0
+  keywords: ['plants']
+  content_provider: goblet
+  status: active
+  space: plants

test/models/content_provider_test.rb

@@ -106,4 +106,27 @@ class ContentProviderTest < ActiveSupport::TestCase
     assert_nil LearningPath.find_by_id(learning_path.id)
     assert_nil Source.find_by_id(source.id)
   end
+
+  test 'in_current_space limits resources to current space if feature enabled' do
+    orig_space = Space.current_space
+    plant_space = spaces(:plants)
+    Space.current_space = plant_space
+    content_provider = content_providers(:goblet)
+    materials = content_provider.materials.in_current_space
+    assert_equal 1, materials.length
+    assert_includes materials, materials(:plant_space_material)
+  ensure
+    Space.current_space = orig_space
+  end
+
+  test 'in_current_space does not limit resources to current space if feature disabled' do
+    content_provider = content_providers(:goblet)
+    with_settings(feature: { spaces: false }) do
+      assert Space.current_space.default?
+      materials = content_provider.materials.in_current_space
+      assert_equal 10, materials.length
+      assert_includes materials, materials(:plant_space_material)
+      assert_includes materials, materials(:good_material)
+    end
+  end
 end