Skip to content

Commit

Permalink
Merge pull request #2043 from DFE-Digital/remove-convert-to-pdf
Browse files Browse the repository at this point in the history
Remove convert to PDF link
  • Loading branch information
thomasleese authored Feb 27, 2024
2 parents 254723e + 8a56c9b commit f17b17c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 33 deletions.
35 changes: 9 additions & 26 deletions app/helpers/document_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,33 +22,16 @@ def document_link_to(document, translated: false)

malware_scan_active =
FeatureFlags::FeatureFlag.active?(:fetch_malware_scan_result)
convert_to_pdf_active =
FeatureFlags::FeatureFlag.active?(:convert_documents_to_pdf)

[
uploads
.map { |upload| upload_link_to(upload) }
.join("<br />")
.html_safe,
if malware_scan_active && scope.scan_result_suspect.exists?
"<em>#{scope.count} #{"file upload".pluralize(scope.count)} has been scanned as malware and deleted.</em>"
elsif request.path.starts_with?("/assessor") && convert_to_pdf_active &&
!uploads.all?(&:is_pdf?)
govuk_link_to(
"Download as PDF (opens in a new tab)",
Rails
.application
.routes
.url_helpers
.assessor_interface_application_form_document_pdf_path(
document,
translated ? "translated" : "original",
),
target: :_blank,
rel: :noopener,
)
end,
].compact_blank.join("<br /><br />").html_safe
items = uploads.map { |upload| upload_link_to(upload) }

if malware_scan_active && scope.scan_result_suspect.exists?
items << tag.em(
"#{scope.count} #{"file upload".pluralize(scope.count)} has been scanned as malware and deleted.",
)
end

tag.ul(class: "govuk-list") { items.map { |item| concat(tag.li(item)) } }
end
end
end
6 changes: 0 additions & 6 deletions config/feature_flags.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
feature_flags:
convert_documents_to_pdf:
author: Thomas Leese
description: >
Provide a way of automatically converting documents to a single PDF suitable for
uploading to the Ecctis portal.
fetch_malware_scan_result:
author: Steve Laing
description: >
Expand Down
1 change: 0 additions & 1 deletion lib/tasks/review_app.rake
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ namespace :review_app do
raise "THIS TASK CANNOT BE RUN IN PRODUCTION"
end

FeatureFlags::FeatureFlag.activate(:convert_documents_to_pdf)
FeatureFlags::FeatureFlag.activate(:personas)
FeatureFlags::FeatureFlag.activate(:teacher_applications)
end
Expand Down

0 comments on commit f17b17c

Please sign in to comment.