gip-inclusion · Holist · Feb 4, 2025 · Feb 4, 2025 · Feb 4, 2025 · Feb 4, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ on: push
 jobs:
   linters:
     name: Linters
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Set up Ruby
@@ -24,7 +24,7 @@ jobs:
         run: yarn lint
   test_unit:
     name: Unit Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     services:
       postgres:
         image: postgres:13.2
@@ -87,7 +87,7 @@ jobs:
 
   test_features:
     name: Feature Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:

diff --git a/Gemfile b/Gemfile
@@ -89,10 +89,6 @@ gem "rqrcode", "~> 2.0", require: false
 gem "rexml"
 gem "addressable"
 
-# Easily generate PDF from HTML
-gem "wicked_pdf"
-gem "wkhtmltopdf-binary"
-
 # CORS support
 gem "rack-cors"
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -341,7 +341,6 @@ GEM
     omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
-    ostruct (0.6.1)
     parallel (1.26.3)
     parallel_tests (4.9.0)
       parallel
@@ -610,13 +609,9 @@ GEM
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    wicked_pdf (2.8.2)
-      activesupport
-      ostruct
     with_advisory_lock (5.1.0)
       activerecord (>= 6.1)
       zeitwerk (>= 2.6)
-    wkhtmltopdf-binary (0.12.6.8)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.7.1)
@@ -702,9 +697,7 @@ DEPENDENCIES
   tzinfo-data
   web-console (>= 3.3.0)
   webmock
-  wicked_pdf
   with_advisory_lock
-  wkhtmltopdf-binary
 
 RUBY VERSION
    ruby 3.4.1p0

diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb
@@ -67,7 +67,22 @@ def invite_user
   end
 
   def pdf
-    WickedPdf.new.pdf_from_string(invitation.content, encoding: "utf-8")
+    conn = Faraday.new(url: ENV["PDF_GENERATOR_URL"]) do |f|
+      f.headers["Authorization"] = ENV["PDF_GENERATOR_API_KEY"]
+      f.headers["Content-Type"] = "application/json"
+    end
+
+    response = conn.post("/generate") do |req|
+      req.body = {
+        htmlContent: invitation.content
+      }.to_json
+    end
+
+    if response.success?
+      Base64.decode64(response.body)
+    else
+      Sentry.capture_message("PDF generation failed", extra: { invitation_id: invitation.id })
+    end
   end
 
   def pdf_filename

diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
@@ -36,7 +36,22 @@ def notify_participation
   end
 
   def pdf
-    WickedPdf.new.pdf_from_string(notify_participation.notification.content, encoding: "utf-8")
+    conn = Faraday.new(url: ENV["PDF_GENERATOR_URL"]) do |f|
+      f.headers["Authorization"] = ENV["PDF_GENERATOR_API_KEY"]
+      f.headers["Content-Type"] = "application/json"
+    end
+
+    response = conn.post("/generate") do |req|
+      req.body = {
+        htmlContent: notify_participation.notification.content
+      }.to_json
+    end
+
+    if response.success?
+      Base64.decode64(response.body)
+    else
+      Sentry.capture_message("PDF generation failed", extra: { notification_id: notify_participation.notification.id })
+    end
   end
 
   def pdf_filename

diff --git a/app/helpers/pdf_helper.rb b/app/helpers/pdf_helper.rb
diff --git a/app/javascript/react/components/user/InvitationCells.jsx b/app/javascript/react/components/user/InvitationCells.jsx
@@ -10,7 +10,7 @@ export default function InvitationCells({ user }) {
     /* ----------------------------- Disabled invitations cases -------------------------- */
     user.isArchived() ? (
       <td colSpan={user.list.invitationsColSpan}>
-        Dossier archivé 
+        Dossier archivé
         {user.isArchivedInCurrentOrganisation() && (
           <Tippy
             content={

diff --git a/app/javascript/stylesheets/pdf.scss b/app/javascript/stylesheets/pdf.scss
diff --git a/app/views/layouts/pdf.html.erb b/app/views/layouts/pdf.html.erb
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>PDF</title>
-  <%= pdf_stylesheet_link_tag("pdf") %>
+  <meta charset="utf-8">
+  <title>PDF</title>
+  <%= stylesheet_link_tag "pdf" %>
 </head>
 <body>
   <%= yield %>

diff --git a/app/views/letters/_header.html.erb b/app/views/letters/_header.html.erb
@@ -1,25 +1,29 @@
-<div>
-  <div class="header-left-col">
+<div class="header">
+  <div class="header-left">
+    <div class="header-logo">
+      <%= image_tag(organisation.logo.attached? ? organisation.logo.url : department.logo.url) %>
+    </div>
+  </div>
+  <div class="header-right">
     <div>
-      <div class="header-logo">
-        <%= image_tag(organisation.logo.attached? ? organisation.logo.url : department.logo.url) %>
-      </div>
+      <p><%= sender_city || department.capital %>, le <%= Date.today.strftime('%d/%m/%Y') %></p>
+      <br/>
+      <p>À l'attention de</p>
+      <br/><br/>
     </div>
-    <% if direction_names.blank? %>
-      <p><%= organisation.name.upcase %></p>
-    <% else %>
-      <% direction_names.each do |direction_name| %>
-        <p><%= direction_name.upcase %></p>
-      <% end %>
-    <% end %>
   </div>
-  <div class="header-right-col">
-    <p><%= sender_city || department.capital %>, le <%= Date.today.strftime('%d/%m/%Y') %></p>
-    <br/>
-    <p>À l'attention de</p>
-    <br/><br/><br/>
+  <div class="user-address">
     <p><%= user.title.upcase %> <%= user.first_name.upcase %> <%= user.last_name.upcase %><br/>
     <%= simple_format(user.parsed_street_address.upcase, {}, wrapper_tag: "span") %><br/>
     <%= user.parsed_post_code_and_city.upcase %></p>
   </div>
 </div>
+<div class="direction-names">
+  <% if direction_names.blank? %>
+    <p><%= organisation.name.upcase %></p>
+  <% else %>
+    <% direction_names.each do |direction_name| %>
+      <p><%= direction_name.upcase %></p>
+    <% end %>
+  <% end %>
+</div>
diff --git a/app/views/letters/invitations/atelier.html.erb b/app/views/letters/invitations/atelier.html.erb
@@ -13,17 +13,16 @@
   <p>Vous êtes <%= user_designation %> et bénéficiez d'un accompagnement. Pour en profiter au mieux, nous vous invitons à vous inscrire directement et librement aux ateliers et formations de votre choix.</p>
   <p>Pour faciliter votre inscription, <%= sender_name %> a mis en place <span class="bold-blue">une plateforme vous permettant de vous inscrire vous-même.</span></p>
   <p>Choisissez un créneau à votre convenance&nbsp;:</p>
-  <div>
-    <div class="invitation-left-col pdf-align-center">
+  <div class="invitation-choices">
+    <div class="pdf-align-center">
       <div>soit en scannant ce QR code</div>
       <div class="qr-code"><%= image_tag(qr_code.to_data_url) %></div>
     </div>
-    <div class="invitation-right-col pdf-align-center">
+    <div class="pdf-align-center">
       <div>soit en vous rendant à l'adresse</div>
       <div class="invitation-token"><%= invitation_url %> </div>
     </div>
   </div>
-  <br style="clear:both"/>
   <%= tag.p tag.span(mandatory_warning, class: "bold-blue") if mandatory_warning %>
   <%= tag.p tag.span("En l'absence d'action de votre part, #{punishable_warning}.", class: "bold-blue") if punishable_warning.present? %>
   <%= render "letters/invitations/help_message", invitation: invitation, help_address: help_address %>

diff --git a/app/views/letters/invitations/atelier_enfants_ados.html.erb b/app/views/letters/invitations/atelier_enfants_ados.html.erb
@@ -10,17 +10,16 @@
   <p>Nous te proposons de découvrir le programme.</p>
   <p><%= sender_name.capitalize %> a mis en place <span class="bold-blue">une plateforme te permettant de t'inscrire.</span></p>
   <p>Choisis ton créneau&nbsp;:</p>
-  <div>
-    <div class="invitation-left-col pdf-align-center">
+  <div class="invitation-choices">
+    <div class="pdf-align-center">
       <div>soit en scannant ce QR code</div>
       <div class="qr-code"><%= image_tag(qr_code.to_data_url) %></div>
     </div>
-    <div class="invitation-right-col pdf-align-center">
+    <div class="pdf-align-center">
       <div>soit en vous rendant à l'adresse</div>
       <div class="invitation-token"><%= invitation_url %> </div>
     </div>
   </div>
-  <br style="clear:both"/>
 
   <div class="letter-signature">
     <%= render "common/organisation_signature", signature_lines: signature_lines, department: department %>

diff --git a/app/views/letters/invitations/short.html.erb b/app/views/letters/invitations/short.html.erb
@@ -13,17 +13,16 @@
   <p>Vous êtes <%= user.conjugate('invité') %> pour un <%= rdv_title %>.</p>
   <p>Pour faciliter votre prise de rendez-vous, <%= sender_name %> a mis en place <span class="bold-blue">une plateforme vous permettant de prendre rendez-vous vous-même.</span></p>
   <p>Choisissez un créneau à votre convenance&nbsp;:</p>
-  <div>
-    <div class="invitation-left-col pdf-align-center">
+  <div class="invitation-choices">
+    <div class="pdf-align-center">
       <div>soit en scannant ce QR code</div>
       <div class="qr-code"><%= image_tag(qr_code.to_data_url) %></div>
     </div>
-    <div class="invitation-right-col pdf-align-center">
+    <div class="pdf-align-center">
       <div>soit en vous rendant à l'adresse</div>
       <div class="invitation-token"><%= invitation_url %> </div>
     </div>
   </div>
-  <br style="clear:both"/>
   <%= tag.p tag.span(mandatory_warning, class: "bold-blue") if mandatory_warning %>
   <%= tag.p tag.span("En l'absence d'action de votre part, #{punishable_warning}.", class: "bold-blue") if punishable_warning.present? %>
   <%= render "letters/invitations/help_message", invitation: invitation, help_address: help_address %>

diff --git a/app/views/letters/invitations/standard.html.erb b/app/views/letters/invitations/standard.html.erb
@@ -14,17 +14,16 @@
   <%= tag.p(custom_sentence) if custom_sentence %>
   <p>Pour faciliter votre prise de rendez-vous, <%= sender_name %> a mis en place <span class="bold-blue">une plateforme vous permettant de prendre rendez-vous vous-même.</span></p>
   <p>Choisissez un créneau à votre convenance<%= " dans un délai de #{Invitation::NUMBER_OF_DAYS_BEFORE_REMINDER} jours à réception de ce courrier" if invitation.expireable? %>&nbsp;:</p>
-  <div>
-    <div class="invitation-left-col pdf-align-center">
+  <div class="invitation-choices">
+    <div class="pdf-align-center">
       <div>soit en scannant ce QR code</div>
       <div class="qr-code"><%= image_tag(qr_code.to_data_url) %></div>
     </div>
-    <div class="invitation-right-col pdf-align-center">
+    <div class="pdf-align-center">
       <div>soit en vous rendant à l'adresse</div>
       <div class="invitation-token"><%= invitation_url %> </div>
     </div>
   </div>
-  <br style="clear:both"/>
   <%= tag.p tag.span(mandatory_warning, class: "bold-blue") if mandatory_warning %>
   <%= tag.p tag.span("En l'absence d'action de votre part, #{punishable_warning}.", class: "bold-blue") if punishable_warning.present? %>
   <%= render "letters/invitations/help_message", invitation: invitation, help_address: help_address %>

diff --git a/config/initializers/wicked_pdf.rb b/config/initializers/wicked_pdf.rb
diff --git a/package.json b/package.json
@@ -29,8 +29,8 @@
     "prop-types": "^15.7.2",
     "qr-scanner": "^1.4.2",
     "react": "^17.0.2",
-    "react-dom": "^17.0.2",
     "react_ujs": "^2.6.1",
+    "react-dom": "^17.0.2",
     "remixicon": "^4.5.0",
     "sass": "^1.70.0",
     "sass-loader": "^14.0.0",

diff --git a/spec/controllers/invitations_controller_spec.rb b/spec/controllers/invitations_controller_spec.rb
@@ -122,7 +122,7 @@
         end
 
         before do
-          allow(WickedPdf).to receive_message_chain(:new, :pdf_from_string)
+          allow(Grover).to receive_message_chain(:new, :to_pdf)
           allow(invitation).to receive(:content).and_return("some content")
         end
 

diff --git a/spec/support/download_helper.rb b/spec/support/download_helper.rb
@@ -1,6 +1,6 @@
 # Inspired by https://dev.to/coorasse/test-downloaded-files-with-rspec-and-system-tests-55mn
 module DownloadHelper
-  TIMEOUT = 10
+  TIMEOUT = 30
   PATH = Rails.root.join("tmp/downloads")
 
   def downloads
@@ -12,7 +12,14 @@ def download
   end
 
   def download_content(format: nil)
-    format == "pdf" ? PDF::Reader.new(download) : File.read(download)
+    wait_for_download
+    case format
+    when "pdf"
+      content = File.read(download, mode: "rb")
+      PDF::Reader.new(StringIO.new(content))
+    else
+      File.read(download)
+    end
   end
 
   def wait_for_download
@@ -21,11 +28,6 @@ def wait_for_download
     end
   end
 
-  def downloaded_content(format: nil)
-    wait_for_download
-    download_content(format:)
-  end
-
   def downloaded?
     !downloading? && downloads.any?
   end