scope visible topics to current_provider

Author: dmitrytrager

app/controllers/settings_controller.rb

@@ -1,6 +1,6 @@
 class SettingsController < ApplicationController
   def provider
-    provider = provider_scope.find(provider_params[:id])
+    provider = provider_scope.find_by(id: provider_params[:id])
     cookies.signed[:current_provider_id] = provider.id if provider
     redirect_to request.referer || root_path
   end

app/controllers/topics_controller.rb

@@ -70,7 +70,7 @@ def scope
     @scope ||= if Current.user.is_admin?
       Topic.all
     else
-      Current.user.topics
+      current_provider.topics
     end.includes(:language, :provider)
   end
 end

app/models/provider.rb

@@ -18,6 +18,7 @@ class Provider < ApplicationRecord
   has_many :regions, through: :branches
   has_many :contributors
   has_many :users, through: :contributors
+  has_many :topics
 
   validates :name, :provider_type, presence: true
   validates :name, uniqueness: true

app/views/topics/_choose_provider.html.erb

@@ -1,4 +1,4 @@
-<%= form_for :provider , url: provider_settings_path, method: :put, data: { controller: "topics", topics_target: "chooseForm" } do |f| %>
+<%= form_for :provider , url: provider_settings_path, method: :put, data: { controller: "topics", topics_target: "chooseForm", turbo_frame: "topics", turbo_action: "advance" } do |f| %>
   <div class="form-body">
     <div class="row">
       <div class="col-md-6 col-12">

app/views/topics/index.html.erb

@@ -4,40 +4,42 @@
   <div class="row" id="table-striped">
     <div class="col-12 cold-md-12">
       <%= render "search", providers: @providers, languages: @languages, params: search_params  %>
-      <div class="card">
-        <div class="card-header d-flex justify-content-between align-items-center">
-          <h2 class="card-title"><%= current_provider.name %>'s topics</h2>
-          <%= link_to new_topic_path, class: "btn btn-primary" do %>
-            <i class="bi bi-plus"></i> Add New Topic
-          <% end %>
-        </div>
-        <div class="card-content">
-          <div class="card-body">
-            <% if @available_providers.any? %>
-              <%= render "choose_provider", providers: @available_providers %>
-            <% end %>
-            <p class="card-text"> Some important information or instruction can be placed here.</p>
-            <%= turbo_frame_tag "topic-list" do %>
-              <div class="table-responsive">
-                <table class="table table-lg table-striped mb-0">
-                  <thead>
-                    <tr>
-                      <th>Title</th>
-                      <th>Description</th>
-                      <th>UID</th>
-                      <th>Language</th>
-                      <th>Provider</th>
-                      <th>State</th>
-                      <th class="text-end">Actions</th>
-                    </tr>
-                  </thead>
-                  <%= render "list", topics: @topics %>
-                </table>
-              </div>
+      <%= turbo_frame_tag "topics" do %>
+        <div class="card">
+          <div class="card-header d-flex justify-content-between align-items-center">
+            <h2 class="card-title"><%= current_provider.name %>'s topics</h2>
+            <%= link_to new_topic_path, class: "btn btn-primary" do %>
+              <i class="bi bi-plus"></i> Add New Topic
             <% end %>
           </div>
+          <div class="card-content">
+            <div class="card-body">
+              <% if @available_providers.any? %>
+                <%= render "choose_provider", providers: @available_providers %>
+              <% end %>
+              <p class="card-text"> Some important information or instruction can be placed here.</p>
+              <%= turbo_frame_tag "topic-list" do %>
+                <div class="table-responsive">
+                  <table class="table table-lg table-striped mb-0">
+                    <thead>
+                      <tr>
+                        <th>Title</th>
+                        <th>Description</th>
+                        <th>UID</th>
+                        <th>Language</th>
+                        <th>Provider</th>
+                        <th>State</th>
+                        <th class="text-end">Actions</th>
+                      </tr>
+                    </thead>
+                    <%= render "list", topics: @topics %>
+                  </table>
+                </div>
+              <% end %>
+            </div>
+          </div>
         </div>
-      </div>
+      <% end %>
     </div>
   </div>
 </section>