Merge pull request #8084 from colinux/view-components-haml-lint

linters: enable haml-lint for View components

app/components/dsfr/card_vertical_component/card_vertical_component.html.haml

@@ -12,11 +12,11 @@
           %ul.fr-tags-group
             - tags.each do |tag|
               %li
-                %p.fr-tag=tag
+                %p.fr-tag= tag
       .fr-card__end
         - if error
           .fr-card__detail.fr-alert.fr-alert--error
-            %p=error
+            %p= error
 
     - if footer_buttons?
       .fr-card__footer

app/components/editable_champ/explication_component/explication_component.html.haml

@@ -6,6 +6,6 @@
     - if @champ.collapsible_explanation_enabled? && @champ.collapsible_explanation_text.present?
       %div
         %p.fr-my-2w
-          %button{type: "button", "aria-controls": dom_id(@champ, :explanation), "aria-expanded": "false", href: dom_id(@champ, :explanation)} Lire plus
-        %p.fr-collapse{ id: dom_id(@champ, :explanation)}
+          %button{ type: "button", "aria-controls": dom_id(@champ, :explanation), "aria-expanded": "false", href: dom_id(@champ, :explanation) } Lire plus
+        %p.fr-collapse{ id: dom_id(@champ, :explanation) }
           = @champ.collapsible_explanation_text

app/components/types_de_champ_editor/champ_component/champ_component.html.haml

@@ -1,5 +1,5 @@
 %li.type-de-champ.flex.column.justify-start{ html_options }
-  .flex.justify-start.section.head{ class: type_de_champ.header_section? ? '' : 'hr'}
+  .flex.justify-start.section.head{ class: type_de_champ.header_section? ? '' : 'hr' }
     .handle.small.icon-only.icon.move-handle{ title: "Déplacer le champ vers le haut ou vers le bas" }
     .flex.justify-start.delete
       = button_to type_de_champ_path, class: 'button small icon-only danger', method: :delete, form: { data: { turbo_confirm: 'Êtes vous sûr de vouloir supprimer ce champ ?' } } do
@@ -16,7 +16,7 @@
               %span.sr-only  Déplacer le champ vers le haut
             %button.move-down.cell{ move_button_options(:down) }
               .icon.arrow-down.small
-              %span.sr-only  Déplacer le champ vers le bas
+              %span.sr-only Déplacer le champ vers le bas
           .cell.flex.justify-start.column.flex-grow
             = form.label :type_champ, "Type de champ", for: dom_id(type_de_champ, :type_champ)
             = form.select :type_champ, grouped_options_for_select(types_of_type_de_champ, type_de_champ.type_champ), {}, class: 'small-margin small inline width-100', id: dom_id(type_de_champ, :type_champ)

app/components/types_de_champ_editor/estimated_fill_duration_component/estimated_fill_duration_component.html.haml

@@ -1,5 +1,5 @@
 %span.fill-duration{ id: dom_id(@revision, :estimated_fill_duration) }
   - if show?
     = t('.estimated_fill_duration')
-    = link_to "https://doc.demarches-simplifiees.fr/tutoriels/tutoriel-administrateur#g.-estimation-de-la-duree-de-remplissage", target: "_blank", rel: "noopener noreferrer" do
+    = link_to "#{DOC_URL}/tutoriels/tutoriel-administrateur#g.-estimation-de-la-duree-de-remplissage", target: "_blank", rel: "noopener noreferrer" do
       = t('.estimated_fill_minutes', estimated_minutes: estimated_fill_duration_minutes)

lib/tasks/lint.rake

@@ -1,6 +1,6 @@
 task :lint do
   sh "bundle exec rubocop --parallel"
-  sh "bundle exec haml-lint app/views/"
+  sh "bundle exec haml-lint app/views/ app/components/"
   sh "bundle exec scss-lint app/assets/stylesheets/"
   sh "bundle exec i18n-tasks missing --locales fr"
   sh "bundle exec i18n-tasks unused --locale en" # TODO: check for all locales