add form for switching providers

dmitrytrager · dcollie2 · commit 307446d3894d · 2025-03-02T08:45:01.000-05:00
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -10,4 +10,5 @@ def current_provider
       Current.user.providers.first
     end
   end
+  helper_method :current_provider
 end
diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
@@ -1,12 +1,16 @@
 class SettingsController < ApplicationController
   def provider
-    provider = provider_scope.find(params[:id])
+    provider = provider_scope.find(provider_params[:id])
     cookies.signed[:current_provider_id] = provider.id if provider
     redirect_to request.referer || root_path
   end
 
   private
 
+  def provider_params
+    params.expect(provider: :id)
+  end
+
   def provider_scope
     @provider_scope ||= if Current.user.is_admin?
       Provider.all
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
@@ -3,7 +3,7 @@ class TopicsController < ApplicationController
 
   def index
     @topics = scope.search_with_params(search_params)
-    @providers = scope.map(&:provider).uniq.sort_by(&:name)
+    @available_providers = other_available_providers
     @languages = scope.map(&:language).uniq.sort_by(&:name)
   end
 
@@ -45,16 +45,22 @@ def archive
 
   private
 
+  def other_available_providers
+    return unless Current.user.providers.any?
+
+    Current.user.providers.where.not(id: current_provider.id)
+  end
+
   def topic_params
     params.require(:topic).permit(:title, :description, :uid, :language_id, :provider_id, documents: [])
   end
 
-  helper_method :search_params
   def search_params
     return {} unless params[:search].present?
 
     params.require(:search).permit(:query, :state, :provider_id, :language_id, :year, :month, :order)
   end
+  helper_method :search_params
 
   def set_topic
     @topic = Topic.find(params[:id])
diff --git a/app/javascript/controllers/topics_controller.js b/app/javascript/controllers/topics_controller.js
@@ -2,14 +2,18 @@ import { Controller } from "@hotwired/stimulus"
 import { useDebounce } from "stimulus-use"
 
 export default class extends Controller {
-  static targets = [ "form" ]
+  static targets = [ "searchForm", "chooseForm" ]
   static debounces = [ "search" ]
 
   connect() {
     useDebounce(this, { wait: 300 })
   }
 
-  search() {
-    this.formTarget.requestSubmit()
+  searchTopics() {
+    this.searchFormTarget.requestSubmit()
+  }
+
+  chooseProvider() {
+    this.chooseFormTarget.requestSubmit()
   }
 }
diff --git a/app/views/topics/_choose_provider.html.erb b/app/views/topics/_choose_provider.html.erb
@@ -0,0 +1,12 @@
+<%= form_for :provider , url: provider_settings_path, method: :put, data: { controller: "topics", topics_target: "chooseForm" } do |f| %>
+  <div class="form-body">
+    <div class="row">
+      <div class="col-md-6 col-12">
+        <div class="form-group">
+          <%= f.label :provider %>
+          <%= f.select :id, options_from_collection_for_select(providers, :id, :name), { prompt: "Change provider" }, class: "form-select", data: { action: "change->topics#chooseProvider" } %>
+        </div>
+      </div>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/topics/_search.html.erb b/app/views/topics/_search.html.erb
@@ -4,49 +4,43 @@
   </div>
   <div class="card-content">
     <div class="card-body">
-      <%= form_for :search, url: topics_path, method: :get, data: { controller: "topics", topics_target: "form", turbo_frame: "topic-list", turbo_action: "advance" } do |f| %>
+      <%= form_for :search, url: topics_path, method: :get, data: { controller: "topics", topics_target: "searchForm", turbo_frame: "topic-list", turbo_action: "advance" } do |f| %>
         <div class="form-body">
           <div class="row">
-            <div class="col-md-6 col-12">
+            <div class="col-12">
               <div class="form-group">
-                <%= f.label :provider %>
-                <%= f.select :provider_id, options_from_collection_for_select(providers, :id, :name, params[:provider_id]), { prompt: "Select provider" }, class: "form-select", data: { action: "change->topics#search" } %>
+                <%= f.label :query %>
+                <%= f.text_field :query, value: params[:query], class: "form-control", data: { action: "input->topics#searchTopics" } %>
               </div>
             </div>
             <div class="col-md-6 col-12">
               <div class="form-group">
                 <%= f.label :language %>
-                <%= f.select :language_id, options_from_collection_for_select(languages, :id, :name, params[:provider_id]),  { prompt: "Select language" }, class: "form-select", data: { action: "change->topics#search" } %>
-              </div>
-            </div>
-            <div class="col-md-6 col-12">
-              <div class="form-group">
-                <%= f.label :query %>
-                <%= f.text_field :query, value: params[:query], class: "form-control", data: { action: "input->topics#search" } %>
+                <%= f.select :language_id, options_from_collection_for_select(languages, :id, :name, params[:provider_id]),  { prompt: "Select language" }, class: "form-select", data: { action: "change->topics#searchTopics" } %>
               </div>
             </div>
             <div class="col-md-3 col-12">
               <div class="form-group">
                 <%= f.label :year %>
-                <%= f.select :year, options_for_select((Date.today.year-10..Date.today.year).to_a, params[:year]), { prompt: "Select year" }, class: "form-select", data: { action: "change->topics#search" } %>
+                <%= f.select :year, options_for_select((Date.today.year-10..Date.today.year).to_a, params[:year]), { prompt: "Select year" }, class: "form-select", data: { action: "change->topics#searchTopics" } %>
               </div>
             </div>
             <div class="col-md-3 col-12">
               <div class="form-group">
                 <%= f.label :month %>
-                <%= f.select :month, options_for_select((1..12).to_a, params[:month]), { prompt: "Select month" }, class: "form-select", data: { action: "change->topics#search" } %>
+                <%= f.select :month, options_for_select((1..12).to_a, params[:month]), { prompt: "Select month" }, class: "form-select", data: { action: "change->topics#searchTopics" } %>
               </div>
             </div>
             <div class="col-md-6 col-12">
               <div class="form-group">
                 <%= f.label :state %>
-                <%= f.select :state, options_for_select(Topic::STATES.index_with(&:itself), params[:state]), { prompt: "Select state" }, class: "form-select", data: { action: "change->topics#search" } %>
+                <%= f.select :state, options_for_select(Topic::STATES.index_with(&:itself), params[:state]), { prompt: "Select state" }, class: "form-select", data: { action: "change->topics#searchTopics" } %>
               </div>
             </div>
             <div class="col-md-6 col-12">
               <div class="form-group">
                 <%= f.label :order %>
-                <%= f.select :order, options_for_select(Topic::SORTS.reverse.index_with(&:itself), params[:order]), {}, class: "form-select", data: { action: "change->topics#search" } %>
+                <%= f.select :order, options_for_select(Topic::SORTS.reverse.index_with(&:itself), params[:order]), {}, class: "form-select", data: { action: "change->topics#searchTopics" } %>
               </div>
             </div>
             <div class="col-12 d-flex justify-content-end">
diff --git a/app/views/topics/index.html.erb b/app/views/topics/index.html.erb
@@ -6,13 +6,16 @@
       <%= 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">Topics</h2>
+          <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">

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,18 @@ import { Controller } from "@hotwired/stimulus"`
`2`	`2`	`import { useDebounce } from "stimulus-use"`
`3`	`3`
`4`	`4`	`export default class extends Controller {`
`5`		`- static targets = [ "form" ]`
	`5`	`+ static targets = [ "searchForm", "chooseForm" ]`
`6`	`6`	`static debounces = [ "search" ]`
`7`	`7`
`8`	`8`	`connect() {`
`9`	`9`	`useDebounce(this, { wait: 300 })`
`10`	`10`	`}`
`11`	`11`
`12`		`- search() {`
`13`		`- this.formTarget.requestSubmit()`
	`12`	`+ searchTopics() {`
	`13`	`+ this.searchFormTarget.requestSubmit()`
	`14`	`+ }`
	`15`	`+`
	`16`	`+ chooseProvider() {`
	`17`	`+ this.chooseFormTarget.requestSubmit()`
`14`	`18`	`}`
`15`	`19`	`}`