Skip to content

Commit

Permalink
Merge pull request #825 from nla/release-please--branches--main--comp…
Browse files Browse the repository at this point in the history
…onents--nla-blacklight

chore(main): release 2.11.1
  • Loading branch information
CEdwardsBlasikiewicz committed Dec 21, 2023
1 parent 53faa81 commit 0855e5b
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 2 deletions.
1 change: 1 addition & 0 deletions .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ THUMBNAIL_SERVICE_API_BASE_URL="define THUMBNAIL_SERVICE_API_BASE_URL"

# Feedback
FEEDBACK_ERROR_URL=https://reftracker.nla.gov.au/reft100.aspx?key=Report_an_error
CULTURALLY_SENSITIVE_URL=https://reftracker.nla.gov.au/reft100.aspx?key=Report_an_error

# Patron Keycloak migration
PATRON_UPGRADE_URL="define PATRON_UPGRADE_URL"
1 change: 1 addition & 0 deletions .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ THUMBNAIL_SERVICE_API_BASE_URL=http://thumbservices.test

# Feedback
FEEDBACK_ERROR_URL=https://reftracker.nla.gov.au/reft100.aspx?key=Report_an_error
CULTURALLY_SENSITIVE_URL=https://reftracker.nla.gov.au/reft100.aspx?key=Report_an_error

# Patron Keycloak migration
PATRON_UPGRADE_URL=https://test.nla.gov.au/patron/upgrade
12 changes: 12 additions & 0 deletions app/assets/images/message-stick.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion app/components/feedback_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
<ul class="list-unstyled">
<li class="feedback-link">
<%= link_to t("feedback.report_error"), helpers.error_feedback_url(@id) %>
<%= link_to t("feedback.culturally_sensitive"), helpers.culturally_sensitive_url(@id) %>
<%= link_to helpers.culturally_sensitive_url(@id) do %>
<%= image_tag "message-stick.svg", width: "16", height: "16", alt: "Message stick", aria: {hidden: true} %> <%= t("feedback.culturally_sensitive") %>
<% end %>
</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,4 +230,4 @@ en:
feedback:
title: "Feedback"
report_error: "Report an error"
culturally_sensitive: "Report culturally sensitive content"
culturally_sensitive: "Report culturally sensitive item"
6 changes: 6 additions & 0 deletions spec/components/feedback_component_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,10 @@

expect(rendered_content).to have_link(I18n.t("feedback.report_error"))
end

it "renders the culturally sensitive item reporting link" do
render_inline(described_class.new("123"))

expect(rendered_content).to have_link(I18n.t("feedback.culturally_sensitive"))
end
end

0 comments on commit 0855e5b

Please sign in to comment.