Merge pull request #1224 from Crown-Commercial-Service/feature/nrmi-165-add-archived-to-agreements-filter

NRMI-165

Author: reemi1510

app/controllers/admin/frameworks_controller.rb

@@ -9,7 +9,7 @@ class Admin::FrameworksController < AdminController
   def index
     @frameworks = Framework.order(:short_name).all
 
-    filter_framework_status params[:framework_status] if params[:framework_status]
+    @frameworks = filter_framework_status(@frameworks)
   end
 
   def new
@@ -109,11 +109,14 @@ def download_template
 
   private
 
-  def filter_framework_status(status_param)
-    return if status_param.size == 2
+  def filter_framework_status(scope)
+    if params[:filters_applied].present?
+      return scope unless params.key?(:framework_status)
 
-    @frameworks = @frameworks.new_state if status_param.include? 'New'
-    @frameworks = @frameworks.published if status_param.include? 'Published'
+      scope.where(aasm_state: params[:framework_status].map(&:downcase))
+    else
+      scope.where(aasm_state: %w[new published])
+    end
   end
 
   def find_framework

app/views/admin/frameworks/index.html.haml

@@ -13,6 +13,7 @@
 .govuk-grid-row
   - if @frameworks.present?
     = form_tag(admin_frameworks_path, method: :get, enforce_utf8: false, remote: :true, id: 'framework_status_filter') do
+      = hidden_field_tag :filters_applied, '1'
       .govuk-grid-column-one-quarter
         #accordion-with-summary-sections.ccs-accordion.ccs-accordion--clean{"data-module" => "govuk-accordion", :class => 'govuk-!-margin-top-7'}
           .govuk-accordion__section.ccs-accordion__section--clean.govuk-form-group.govuk-form-group--enclosure.ccs-form-group--enclosure--tight
@@ -25,17 +26,30 @@
               .govuk-form-group
                 %fieldset.govuk-fieldset
                   %legend.govuk-fieldset__legend.govuk-fieldset__legend--m
+                  - if params[:filters_applied].present?
+                    - selected_statuses = Array(params[:framework_status])
+                  - else
+                    - selected_statuses = %w[published new]
+
                   .govuk-checkboxes{id: 'framework_status_checkboxes'}          
                     .govuk-checkboxes__item.govuk-checkboxes__item--small
-                      = check_box_tag('framework_status[]', 'New', false,
+                      = check_box_tag('framework_status[]', 'New',
+                        selected_statuses.include?('new'),
                         id: 'framework_status_new',
                         class: 'govuk-checkboxes__input govuk-checkboxes__input--small')
                       = label_tag "framework_status_new", "New", class: 'govuk-checkboxes__label'
                     .govuk-checkboxes__item.govuk-checkboxes__item--small
-                      = check_box_tag('framework_status[]', 'Published', false,
+                      = check_box_tag('framework_status[]', 'Published',
+                        selected_statuses.include?('published'),
                         id: 'framework_status_published',
                         class: 'govuk-checkboxes__input govuk-checkboxes__input--small')
                       = label_tag "framework_status_published", "Published", class: 'govuk-checkboxes__label'
+                    .govuk-checkboxes__item.govuk-checkboxes__item--small
+                      = check_box_tag('framework_status[]', 'Archived',
+                        selected_statuses.include?('archived'),
+                        id: 'framework_status_archived',
+                        class: 'govuk-checkboxes__input govuk-checkboxes__input--small')
+                      = label_tag "framework_status_archived", "Archived", class: 'govuk-checkboxes__label'
           %noscript
             = surround "&nbsp&nbsp".html_safe do
               = submit_tag "Submit", id: 'framework-status-filter-submit', data: { 'prevent-double-click': true }, class: 'govuk-button'

spec/features/admin_can_list_frameworks_spec.rb

@@ -8,11 +8,13 @@
     # And there are some published frameworks
     FactoryBot.create(:framework, name: 'Laundry Framework 1', short_name: 'RM1234')
     FactoryBot.create(:framework, name: 'Vehicle Purchase Framework 1', short_name: 'RM5678')
-    # And there are some unpublished frameworks
+    # And there is a new/unpublished frameworks
     FactoryBot.create(:framework, aasm_state: 'new', name: 'Vehicle Purchase Framework 2', short_name: 'RM5679')
+    # And there is an archived frameworks
+    FactoryBot.create(:framework, aasm_state: 'archived', name: 'Archived framework', short_name: 'RM5789')
   end
 
-  scenario 'There are some published and unpublished agreements' do
+  scenario 'There are some new and published but not archived agreements' do
     # When I click the "Agreements" link from the main admin page
     visit admin_root_path
     click_link 'Agreements'
@@ -35,26 +37,27 @@
       expect(page).to have_text('Vehicle Purchase Framework 2')
       expect(page).to have_text('new')
     end
+
+    expect(page).not_to have_text('RM5789')
+    expect(page).not_to have_text('Vehicle Purchase Framework 3')
   end
 
   scenario 'agreements can be filtered by status' do
     visit admin_root_path
     click_link 'Agreements'
 
-    page.check('framework_status_new')
+    page.uncheck('framework_status_published')
     find('#framework-status-filter-submit').click
 
     expect(page).to have_text('RM5679')
     expect(page).to have_text('Vehicle Purchase Framework 2')
     expect(page).not_to have_text('RM5678')
     expect(page).not_to have_text('Vehicle Purchase Framework 1')
 
-    page.check('framework_status_published')
+    page.check('framework_status_archived')
     find('#framework-status-filter-submit').click
 
-    expect(page).to have_text('RM1234')
-    expect(page).to have_text('Laundry Framework 1')
-    expect(page).not_to have_text('RM5679')
-    expect(page).not_to have_text('Vehicle Purchase Framework 2')
+    expect(page).to have_text('RM5789')
+    expect(page).to have_text('Archived framework')
   end
 end