Merge pull request #4934 from rubyforgood/revert-4930-4889-add-by-def…

…ault-storage-filter

Revert "Resolves #4889: Add by default storage filter"

app/controllers/requests_controller.rb

@@ -12,16 +12,14 @@ def index
     @paginated_requests = @requests.includes(:partner).page(params[:page])
     @calculate_product_totals = RequestsTotalItemsService.new(requests: @requests).calculate
     @items = current_organization.items.alphabetized.select(:id, :name)
-    @partners = current_organization.partners.alphabetized.select(:id, :name, :default_storage_location_id)
+    @partners = current_organization.partners.alphabetized.select(:id, :name)
     @statuses = Request.statuses.transform_keys(&:humanize)
     @partner_users = User.where(id: @paginated_requests.map(&:partner_user_id)).select(:id, :name, :email)
     @request_types = Request.request_types.transform_keys(&:humanize)
-    @default_storage_locations = StorageLocation.where(id: @partners.map(&:default_storage_location_id))
     @selected_request_type = filter_params[:by_request_type]
     @selected_request_item = filter_params[:by_request_item_id]
     @selected_partner = filter_params[:by_partner]
     @selected_status = filter_params[:by_status]
-    @selected_default_storage_location = filter_params[:by_default_storage_location]
 
     respond_to do |format|
       format.html
@@ -75,6 +73,6 @@ def load_items
     def filter_params
     return {} unless params.key?(:filters)
 
-    params.require(:filters).permit(:by_request_item_id, :by_partner, :by_status, :by_request_type, :by_default_storage_location)
+    params.require(:filters).permit(:by_request_item_id, :by_partner, :by_status, :by_request_type)
   end
 end

app/models/request.rb

@@ -48,7 +48,6 @@ class Request < ApplicationRecord
   # status scope to allow filtering by status
   scope :by_status, ->(status) { where(status: status) }
   scope :by_request_type, ->(request_type) { where(request_type: request_type) }
-  scope :by_default_storage_location, ->(default_storage_location) { includes(:partner).where(partners: {default_storage_location_id: default_storage_location}) }
   scope :during, ->(range) { where(created_at: range) }
   scope :for_csv_export, ->(organization, *) {
     where(organization: organization)

app/views/requests/index.html.erb

@@ -50,9 +50,6 @@
                 <div class="form-group col-lg-3 col-md-3 col-sm-6 col-xs-12">
                   <%= filter_select(scope: :by_request_type, collection: @request_types, key: :last, value: :first, selected: @selected_request_type) %>
                 </div>
-                <div class="form-group col-lg-3 col-md-3 col-sm-6 col-xs-12">
-                  <%= filter_select(scope: :by_default_storage_location, collection: @default_storage_locations, selected: @selected_default_storage_location) %>
-                </div>
                 <div class="form-group col-lg-3 col-md-3 col-sm-6 col-xs-12">
                   <%= filter_select(scope: :by_status, collection: @statuses, key: :last, value: :first, selected: @selected_status) %>
                 </div>

docs/user_guide/bank/essentials_requests.md

@@ -34,8 +34,6 @@ The list contains:
 You can filter the Request list by:
 - Item
 - Partner
-- Request Type
-- Default Storage Location
 - Status
 - Date range
 

spec/system/request_system_spec.rb

@@ -5,7 +5,7 @@
   let(:item1) { create(:item, name: "Good item") }
   let(:item2) { create(:item, name: "Crap item") }
   let(:partner1) { create(:partner, name: "This Guy", email: "[email protected]") }
-  let(:partner2) { create(:partner, name: "That Guy", email: "[email protected]", default_storage_location_id: storage_location.id) }
+  let(:partner2) { create(:partner, name: "That Guy", email: "[email protected]") }
   let!(:storage_location) { create(:storage_location, organization: organization) }
 
   before do
@@ -93,16 +93,6 @@
         end
       end
 
-      context "when filtering by default storage location" do
-        it "constrains the list" do
-          visit subject
-          expect(page).to have_css("table tbody tr", count: 5)
-          select(storage_location.name, from: "filters[by_default_storage_location]")
-          click_on 'Filter'
-          expect(page).to have_css("table tbody tr", count: 1)
-        end
-      end
-
       context "when exporting as CSV" do
         it "respects the applied filters" do
           visit subject