| # |
- <%- if admin_permissions? %>
-
- Organization name
- |
- <% end %>
Name
@@ -57,11 +51,6 @@
|
<%= index + 1 %>
|
- <%- if admin_permissions? %>
-
- <%= render "admin/organizations/badge", organization: form.organization %>
- |
- <% end %>
<%= link_to form.name, admin_form_path(form) %>
|
diff --git a/app/views/admin/site/index.html.erb b/app/views/admin/site/index.html.erb
index b5b50fb9c..83d78a719 100644
--- a/app/views/admin/site/index.html.erb
+++ b/app/views/admin/site/index.html.erb
@@ -38,6 +38,11 @@
Users
+
+ <%= link_to all_admin_forms_path do %>
+ All Forms
+ <% end %>
+
Client Management
@@ -53,11 +58,6 @@
Manage Sidekiq
-
- <%= link_to admin_record_retention_path do %>
- Record Retention
- <% end %>
-
@@ -127,6 +127,11 @@
Integrations
<% end %>
+
+ <%= link_to admin_record_retention_path do %>
+ Record Retention
+ <% end %>
+
diff --git a/config/environments/development.rb b/config/environments/development.rb
index f4e9d6d0d..f132b9fbd 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -3,7 +3,7 @@
Rails.application.configure do
config.after_initialize do
Bullet.enable = true
- Bullet.alert = true
+ Bullet.alert = false
Bullet.bullet_logger = true
Bullet.console = true
Bullet.rails_logger = true
diff --git a/config/routes.rb b/config/routes.rb
index 3e28f1e55..2fb61313e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -305,6 +305,7 @@
get 'events', to: 'forms#events', as: :events
end
collection do
+ get 'all', to: 'forms#all'
post 'copy', to: 'forms#copy', as: :copy_id
end
resources :form_sections, except: %i[index show edit] do
diff --git a/package-lock.json b/package-lock.json
index f2f085460..c8c2797af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6314,9 +6314,9 @@
"license": "MIT"
},
"node_modules/qs": {
- "version": "6.14.1",
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
- "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==",
+ "version": "6.14.2",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
+ "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==",
"dev": true,
"license": "BSD-3-Clause",
"dependencies": {
diff --git a/spec/features/admin/forms_spec.rb b/spec/features/admin/forms_spec.rb
index c4d22280c..422c35792 100644
--- a/spec/features/admin/forms_spec.rb
+++ b/spec/features/admin/forms_spec.rb
@@ -7,42 +7,58 @@
3.days.from_now
end
let(:organization) { FactoryBot.create(:organization) }
+ let(:another_organization) { FactoryBot.create(:organization, :another) }
let(:admin) { FactoryBot.create(:user, :admin, organization:) }
let(:user) { FactoryBot.create(:user, organization:) }
context 'as Admin' do
+ let!(:user_forms) do
+ FactoryBot.create_list(:form, 3, organization:) do |form, i|
+ FactoryBot.create(:user_role, :form_manager, user: admin, form:)
+ if i == 0
+ form.update(aasm_state: :archived)
+ end
+ end
+ end
+ let!(:form_in_my_org) { FactoryBot.create(:form, organization:) }
+ let!(:form_in_other_org) { FactoryBot.create(:form, organization: another_organization) }
+
before do
login_as(admin)
end
describe '/admin/forms' do
- let!(:form) { FactoryBot.create(:form, organization:) }
- let!(:form2) { FactoryBot.create(:form, organization:) }
- let!(:form3) { FactoryBot.create(:form, organization:) }
- let!(:form4) { FactoryBot.create(:form, organization:, aasm_state: :submitted) }
- let!(:form5) { FactoryBot.create(:form, organization:, aasm_state: :archived) }
-
before do
visit admin_forms_path
end
- it 'displays 3 published forms' do
+ it 'displays 2 published form owned by the admin user' do
+ expect(find_all('.usa-table tbody tr').size).to eq(2)
expect(page).to have_content('PUBLISHED')
expect(page).to_not have_content('ARCHIVED')
- expect(find_all('.usa-table tbody tr').size).to eq(3)
end
context 'use the visible buttons to filter for archived forms' do
- it 'displays 1 archived form' do
+ it 'displays 1 archived form owned by the admin user' do
within('.form-filter-buttons') do
click_on('Archived')
end
+ expect(find_all('.usa-table tbody tr').size).to eq(1)
expect(page).to have_content('ARCHIVED')
expect(page).to_not have_content('PUBLISHED')
- expect(find_all('.usa-table tbody tr').size).to eq(1)
end
end
end
+
+ describe '/admin/forms/all' do
+ before do
+ visit all_admin_forms_path
+ end
+
+ it 'displays all 5 forms' do
+ expect(find_all('.usa-table tbody tr').size).to eq(5)
+ end
+ end
end
context 'as Admin' do
@@ -1432,6 +1448,18 @@
end
end
+ context 'as non-admin user' do
+ before do
+ login_as(user)
+ end
+
+ it 'cannot access All Forms page' do
+ visit all_admin_forms_path
+ expect(page.current_path).to eq(admin_root_path)
+ expect(page).to have_content('Authorization is Required')
+ end
+ end
+
context 'Form owner with Form Manager permissions Delete Action' do
let!(:form) { FactoryBot.create(:form, :single_question, organization:) }
let!(:user_role) { FactoryBot.create(:user_role, :form_manager, user: admin, form:) }