Skip to content

ensure submission tags are applied #1738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanwoldatwork merged 1 commit into from
Jan 7, 2025
Merged

ensure submission tags are applied #1738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/admin/submissions_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def add_tag

if !tag.strip.empty? && !@submission.tags.include?(tag)
unique_tags = (@submission.tags.clone << tag.strip.downcase).uniq
@submission.update(tags: unique_tags)
@submission.update_attribute(:tags, unique_tags)
@submission.form.update_submission_tags!(@submission.tags)
end
end
Expand Down
7 changes: 3 additions & 4 deletions app/views/admin/submissions/_tags.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<%= form_with(model: submission, url: admin_form_submission_path(submission.form, submission), local: true) do |f| %>
<div class="grid-row">
<div class="grid-col-12">
<h3>
<div class="font-serif-md margin-bottom-2">
Tags
<%= link_to "https://github.com/gsa/touchpoints/wiki/tagging-responses", target: "_blank", rel: "noopener" do %>
<span class="fa fa-info-circle"></span>
<% end %>
</h3>
</div>
<div class="tag-list applied">
<ul class="usa-list usa-list--unstyled">
<% submission.tags.sort.each do |tag| %>
Expand All @@ -26,8 +26,7 @@

<% @unused_tags = @form.submission_tags - submission.tags %>
<% if @unused_tags.present? %>
<br>
<div class="tag-list available">
<div class="tag-list available margin-top-2">
<% @unused_tags.each do |tag| %>
<span class="usa-tag add-tag-button bg-base-light"
data-action="<%= admin_form_submission_path(submission.form, submission) %>"><%= tag %></span>
Expand Down
14 changes: 11 additions & 3 deletions spec/features/admin/submissions_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,22 @@
it 'adds a tag' do
fill_in 'submission_tag_list', with: 'tag1'
find('#submission_tag_list').native.send_key :tab
expect(page).to have_content('TAG1')
within(".tag-list.applied") do
expect(page).to have_content('TAG1')
end
visit page.current_path
within(".tag-list.applied") do
expect(page).to have_content('TAG1')
end
end

it 'adds multiple tags' do
fill_in 'submission_tag_list', with: 'tag1, tag2'
find('#submission_tag_list').native.send_key :tab
expect(page).to have_content('TAG1')
expect(page).to have_content('TAG2')
within(".tag-list.applied") do
expect(page).to have_content('TAG1')
expect(page).to have_content('TAG2')
end
end

it 'removes a tag' do
Expand Down
Loading