gip-inclusion · Holist · Feb 4, 2025 · Feb 4, 2025 · Feb 4, 2025 · Feb 4, 2025
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -22,6 +22,8 @@
     "no-nested-ternary": "off",
     "no-use-before-define": "off",
     "react/jsx-props-no-spreading": "off",
-    "jsx-a11y/no-autofocus": "off"
+    "jsx-a11y/no-autofocus": "off",
+    "react/jsx-no-useless-fragment": "off",
+    "react/function-component-definition": "off"
   }
 }
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:
@@ -114,11 +114,16 @@ jobs:
           - 6379:6379
         options: --entrypoint redis-server
     steps:
+      - name: Disable AppArmor
+        # https://chromium.googlesource.com/chromium/src/+/main/docs/security/apparmor-userns-restrictions.md
+        run: echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns
       - uses: actions/checkout@v4
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
+      - name: Installing Chrome for Puppeteer test
+        run: npx puppeteer browsers install chrome
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

diff --git a/Gemfile b/Gemfile
@@ -85,9 +85,8 @@ gem "addressable"
 
 gem "agent_connect", github: "gip-inclusion/agent_connect_engine"
 
-# Easily generate PDF from HTML
-gem "wicked_pdf"
-gem "wkhtmltopdf-binary"
+# Easily generate PDF from HTML with puppeteer and headless chrome
+gem "grover"
 
 # CORS support
 gem "rack-cors"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -233,6 +233,8 @@ GEM
       rake (>= 13)
     groupdate (6.5.1)
       activesupport (>= 7)
+    grover (1.2.3)
+      nokogiri (~> 1)
     hashdiff (1.1.2)
     hashery (2.1.2)
     htmlentities (4.3.4)
@@ -633,7 +635,6 @@ GEM
     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)
@@ -669,6 +670,7 @@ DEPENDENCIES
   factory_bot_rails
   faraday
   groupdate
+  grover
   image_processing
   jbuilder (~> 2.7)
   jsbundling-rails
@@ -717,9 +719,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,7 @@ def invite_user
   end
 
   def pdf
-    WickedPdf.new.pdf_from_string(invitation.content, encoding: "utf-8")
+    Grover.new(invitation.content, format: "A4", print_background: true).to_pdf
   end
 
   def pdf_filename

diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
@@ -36,7 +36,7 @@ def notify_participation
   end
 
   def pdf
-    WickedPdf.new.pdf_from_string(notify_participation.notification.content, encoding: "utf-8")
+    Grover.new(notify_participation.notification.content, format: "A4", print_background: true).to_pdf
   end
 
   def pdf_filename

diff --git a/app/helpers/pdf_helper.rb b/app/helpers/pdf_helper.rb
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,27 @@
-<div>
-  <div class="header-left-col">
-    <div>
-      <div class="header-logo">
-        <%= image_tag(organisation.logo.attached? ? organisation.logo.url : department.logo.url) %>
-      </div>
+<div class="header">
+  <div>
+    <div class="header-logo">
+      <%= image_tag(organisation.logo.attached? ? organisation.logo.url : department.logo.url) %>
     </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">
+  <div>
     <p><%= sender_city || department.capital %>, le <%= Date.today.strftime('%d/%m/%Y') %></p>
     <br/>
     <p>À l'attention de</p>
-    <br/><br/><br/>
+    <br/><br/>
+  </div>
+  <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
@@ -27,10 +27,11 @@
     "mobx": "^6.10.0",
     "mobx-react-lite": "^4.0.3",
     "prop-types": "^15.7.2",
+    "puppeteer": "^24.1.1",
     "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",
@@ -46,7 +47,7 @@
   "version": "1.22.5",
   "devDependencies": {
     "eslint": "^8.49.0",
-    "eslint-config-airbnb": "^18.2.1",
+    "eslint-config-airbnb": "^19.0.4",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jsx-a11y": "^6.4.1",

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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,7 +67,7 @@ def invite_user @@
       end
       def pdf
-        WickedPdf.new.pdf_from_string(invitation.content, encoding: "utf-8")
+        Grover.new(invitation.content, format: "A4", print_background: true).to_pdf
       end
       def pdf_filename
@@ Expand Down @@