remove icon from admin dashboard and use badge - Figma

app/components/groupe_gestionnaire/card/children_component/children_component.html.haml

@@ -1,9 +1,7 @@
 .fr-col-6.fr-col-md-4.fr-col-lg-3
   = link_to gestionnaire_groupe_gestionnaire_children_path(@groupe_gestionnaire), id: 'gestionnaires', class: 'fr-tile fr-enlarge-link' do
     .fr-tile__body.flex.column.align-center.justify-between
-      %div
+      %p.fr-badge.fr-badge--success Validé
-        %span.icon.accept
-        %p.fr-tile-status-accept Validé
       %div
         .line-count.fr-my-1w
           %p.fr-tag= @groupe_gestionnaire.children.size

app/components/groupe_gestionnaire/card/gestionnaires_component/gestionnaires_component.html.haml

@@ -1,9 +1,7 @@
 .fr-col-6.fr-col-md-4.fr-col-lg-3
   = link_to gestionnaire_groupe_gestionnaire_gestionnaires_path(@groupe_gestionnaire), id: 'gestionnaires', class: 'fr-tile fr-enlarge-link' do
     .fr-tile__body.flex.column.align-center.justify-between
-      %div
+      %p.fr-badge.fr-badge--success Validé
-        %span.icon.accept
-        %p.fr-tile-status-accept Validé
       %div
         .line-count.fr-my-1w
           %p.fr-tag= @groupe_gestionnaire.gestionnaires.size

app/components/procedure/card/administrateurs_component/administrateurs_component.html.haml

@@ -1,9 +1,7 @@
 .fr-col-6.fr-col-md-4.fr-col-lg-3
   = link_to admin_procedure_administrateurs_path(@procedure), id: 'administrateurs', class: 'fr-tile fr-enlarge-link' do
     .fr-tile__body.flex.column.align-center.justify-between
-      %div
+      %p.fr-badge.fr-badge--success Validé
-        %span.icon.accept
-        %p.fr-tile-status-accept Validé
       %div
         .line-count.fr-my-1w
           %p.fr-tag= @procedure.administrateurs.size

app/components/procedure/card/annotations_component/annotations_component.html.haml

@@ -6,13 +6,9 @@
           %span.icon.refuse
           %p.fr-tile-status-error À modifier
       - elsif @count == 0
-        %div
+        %p.fr-badge.fr-badge--info À configurer
-          %span.icon.clock
-          %p.fr-tile-status-todo À configurer
       - else
-        %div
+        %p.fr-badge.fr-badge--success Validé
-          %span.icon.accept
-          %p.fr-tile-status-accept Validé
       %div
         .line-count.fr-my-1w
           %p.fr-tag= @count

app/components/procedure/card/api_entreprise_component/api_entreprise_component.html.haml

@@ -2,13 +2,9 @@
   = link_to jeton_admin_procedure_path(@procedure), class: 'fr-tile fr-enlarge-link' do
     .fr-tile__body.flex.column.align-center.justify-between
       - if @procedure.api_entreprise_token.present?
-        %div
+        %p.fr-badge.fr-badge--success Validé
-          %span.icon.accept
-          %p.fr-tile-status-accept Validé
       - else
-        %div
+        %p.fr-badge.fr-badge--info À configurer
-          %span.icon.clock
-          %p.fr-tile-status-todo À configurer
       %div
         %h3.fr-h6.fr-mt-10v= t('.title')
         %p.fr-tile-subtitle Configurer le jeton API entreprise

app/components/procedure/card/api_particulier_component/api_particulier_component.html.haml

@@ -2,13 +2,9 @@
   = link_to admin_procedure_api_particulier_path(@procedure), class: 'fr-tile fr-enlarge-link', id: 'api-particulier' do
     .fr-tile__body.flex.column.align-center.justify-between
       - if @procedure.api_particulier_token.present?
-        %div
+        %p.fr-badge.fr-badge--success= t('.ready')
-          %span.icon.accept
-          %p.fr-tile-status-accept= t('.ready')
       - else
-        %div
+        %p.fr-badge.fr-badge--info= t('.needs_configuration')
-          %span.icon.clock
-          %p.fr-tile-status-todo= t('.needs_configuration')
       %div
         %h3.fr-h6.fr-mt-10v= Procedure.human_attribute_name(:api_particulier_token)
         %p.fr-tile-subtitle= t('.configure_api_particulier_token')

app/components/procedure/card/attestation_component/attestation_component.html.haml

@@ -4,15 +4,11 @@
       - if @procedure.attestation_template&.activated?
         %div
           - if error_messages.present?
-            %span.icon.refuse
+            %p.fr-badge.fr-badge--warning À modifier
-            %p.fr-tile-status-error À modifier
           - else
-            %span.icon.accept
+            %p.fr-badge.fr-badge--success Activée
-            %p.fr-tile-status-accept Activée
       - else
-        %div
+        %p.fr-badge Désactivée
-          %span.icon.clock
-          %p.fr-tile-status-todo Désactivée
       %div
         %h3.fr-h6.fr-mt-10v= t('.title')
         %p.fr-tile-subtitle Délivrance automatique pour les dossiers acceptés

app/components/procedure/card/champs_component/champs_component.html.haml

@@ -6,13 +6,9 @@
           %span.icon.refuse
           %p.fr-tile-status-error À modifier
       - elsif @count == 0
-        %div
+        %p.fr-badge.fr-badge--warning À faire
-          %span.icon.clock
-          %p.fr-tile-status-todo À faire
       - else
-        %div
+        %p.fr-badge.fr-badge--success Validé
-          %span.icon.accept
-          %p.fr-tile-status-accept Validé
       %div
         .line-count.fr-my-1w
           %p.fr-tag= @count

app/components/procedure/card/chorus_component/chorus_component.html.haml

@@ -2,13 +2,9 @@
   = link_to edit_admin_procedure_chorus_path(@procedure), class: 'fr-tile fr-enlarge-link', title: 'Configurer le cadre budgetaire Chorus' do
     .fr-tile__body.flex.column.align-center.justify-between
       - if !@procedure.chorus_configuration.complete?
-        %div
+        %p.fr-badge.fr-badge--warning À compléter
-          %span.icon.clock
-          %p.fr-tile-status-todo À compléter
       - else
-        %div
+        %p.fr-badge.fr-badge--success Configuré
-          %span.icon.accept
-          %p.fr-tile-status-accept Configuré
       %div
         %h3.fr-h6.fr-mt-10v
           Connecteur Chorus

app/components/procedure/card/dossier_submitted_message_component/dossier_submitted_message_component.html.haml

@@ -2,13 +2,9 @@
   = link_to edit_admin_procedure_dossier_submitted_message_path(@procedure), class: 'fr-tile fr-enlarge-link' do
     .fr-tile__body.flex.column.align-center.justify-between
       - if @procedure.active_dossier_submitted_message.present?
-        %div
+        %p.fr-badge.fr-badge--success Validé
-          %span.icon.accept
-          %p.fr-tile-status-accept Validé
       - else
-        %div
+        %p.fr-badge.fr-badge--info À configurer
-          %span.icon.clock
-          %p.fr-tile-status-todo À configurer
       %div
         %h3.fr-h6.fr-mt-10v= t('.title')
         %p.fr-tile-subtitle Orienter l'usager suite à l'envoi de son dossier

app/components/procedure/card/emails_component/emails_component.html.haml

@@ -3,14 +3,11 @@
     .fr-tile__body.flex.column.align-center.justify-between
       %div
         - if error_messages.present?
-          %span.icon.refuse
+          %p.fr-badge.fr-badge--warning À modifier
-          %p.fr-tile-status-error À modifier
         - elsif fully_customized?
-          %span.icon.accept
+          %p.fr-badge.fr-badge--success Validé
-          %p.fr-tile-status-todo Validé
         - else
-          %span.icon.clock
+          %p.fr-badge.fr-badge--info À configurer
-          %p.fr-tile-status-todo À configurer
       %div
         .line-count.fr-my-1w
           %p.fr-tag= customized_progress

app/components/procedure/card/experts_component/experts_component.html.haml

@@ -1,9 +1,7 @@
 .fr-col-6.fr-col-md-4.fr-col-lg-3
   = link_to admin_procedure_experts_path(@procedure), class: 'fr-tile fr-enlarge-link' do
     .fr-tile__body.flex.column.align-center.justify-between
-      %div
+      %p.fr-badge.fr-badge--info À configurer
-        %span.icon.preview
-        %p.fr-tile-status-todo À configurer
       %div
         %h3.fr-h6.fr-mt-10v= t('.title')
         %p.fr-tile-subtitle Gérer les avis des experts invités

app/components/procedure/card/instructeurs_component/instructeurs_component.html.haml

@@ -2,13 +2,9 @@
   = link_to admin_procedure_groupe_instructeurs_path(@procedure), id: 'groupe-instructeurs', class: 'fr-tile fr-enlarge-link' do
     .fr-tile__body.flex.column.align-center.justify-between
       - if @procedure.routing_enabled? || @procedure.instructeurs.present?
-        %div
+        %p.fr-badge.fr-badge--success Validé
-          %span.icon.accept
-          %p.fr-tile-status-accept Validé
       - else
-        %div
+        %p.fr-badge.fr-badge--warning À faire
-          %span.icon.clock
-          %p.fr-tile-status-todo À faire
       %div
         .line-count.fr-my-1w
           - if @procedure.routing_enabled?

app/components/procedure/card/modifications_component/modifications_component.html.haml

@@ -1,12 +1,11 @@
 .fr-col-6.fr-col-md-4.fr-col-lg-3
   = link_to modifications_admin_procedure_path(@procedure), id: 'modifications', class: 'fr-tile fr-enlarge-link' do
     .fr-tile__body.flex.column.align-center.justify-between
+      %p.fr-badge.fr-badge--success Activée
       %div
-        %span.icon.accept
+        .line-count.fr-my-1w
-        %p.fr-tile-status-accept Activée
-      %div
-        %h3.fr-h6.fr-mt-10v
           %p.fr-tag= @procedure.revisions_count
+        %h3.fr-h6
           = t('.title', count: @procedure.revisions_count)
 
         %p.fr-tile-subtitle Historique des modifications du formulaire

app/components/procedure/card/mon_avis_component/mon_avis_component.html.haml

@@ -2,13 +2,9 @@
   = link_to monavis_admin_procedure_path(@procedure), class: 'fr-tile fr-enlarge-link' do
     .fr-tile__body.flex.column.align-center.justify-between
       - if @procedure.monavis_embed.present?
-        %div
+        %p.fr-badge.fr-badge--success Validé
-          %span.icon.accept
-          %p.fr-tile-status-accept Validé
       - else
-        %div
+        %p.fr-badge.fr-badge--info À configurer
-          %span.icon.clock
-          %p.fr-tile-status-todo À configurer
       %div
         %h3.fr-h6.fr-mt-10v= t('.title')
         %p.fr-tile-subtitle Avis des usagers sur votre démarche

app/components/procedure/card/presentation_component/presentation_component.html.haml

@@ -1,9 +1,7 @@
 .fr-col-6.fr-col-md-4.fr-col-lg-3
   = link_to edit_admin_procedure_path(@procedure), id: 'presentation', class: 'fr-tile fr-enlarge-link' do
     .fr-tile__body.flex.column.align-center.justify-between
-      %div
+      %p.fr-badge.fr-badge--success Validé
-        %span.icon.accept
-        %p.fr-tile-status-accept Validé
       %div
         %h3.fr-h6.fr-mt-10v= t('.title')
         %p.fr-tile-subtitle Logo, nom, description

app/components/procedure/card/service_component/service_component.html.haml

@@ -2,13 +2,9 @@
   = link_to service_link, class: 'fr-tile fr-enlarge-link', id: 'service' do
     .fr-tile__body.flex.column.align-center.justify-between
       - if @procedure.service_id.present?
-        %div
+        %p.fr-badge.fr-badge--success Validé
-          %span.icon.accept
-          %p.fr-tile-status-accept Validé
       - else
-        %div
+        %p.fr-badge.fr-badge--warning À faire
-          %span.icon.clock
-          %p.fr-tile-status-todo À faire
       %div
         %h3.fr-h6.fr-mt-10v= t('.title')
         %p.fr-tile-subtitle

app/components/procedure/card/sva_svr_component/sva_svr_component.html.haml

@@ -2,13 +2,9 @@
   = link_to edit_admin_procedure_sva_svr_path(@procedure), class: 'fr-tile fr-enlarge-link', id: 'sva' do
     .fr-tile__body.flex.column.align-center.justify-between
       - if @procedure.sva_svr_enabled?
-        %div
+        %p.fr-badge.fr-badge--success= t('.ready')
-          %span.icon.accept
-          %p.fr-tile-status-accept= t('.ready')
       - else
-        %div
+        %p.fr-badge.fr-badge--info= t('.needs_configuration')
-          %span.icon.clock
-          %p.fr-tile-status-todo= t('.needs_configuration')
       %h3.fr-h6.fr-mt-10v= t('.title')
       %p.fr-tile-subtitle= t('.subtitle')
       %p.fr-btn.fr-btn--tertiary= t('views.shared.actions.edit')

app/components/procedure/card/zones_component/zones_component.html.haml

@@ -2,13 +2,9 @@
   = link_to zones_admin_procedure_path(@procedure), id: 'zones', class: 'fr-tile fr-enlarge-link' do
     .fr-tile__body.flex.column.align-center.justify-between
       - if @procedure.zones.size >= 1
-        %div
+        %p.fr-badge.fr-badge--success Validé
-          %span.icon.accept
-          %p.fr-tile-status-accept Validé
       - else
-        %div
+        %p.fr-badge.fr-badge--info À faire
-          %span.icon.clock
-          %p.fr-tile-status-todo À faire
       %div
         %h3.fr-h6.fr-mt-10v= t('.title')
         %p.fr-tile-subtitle= t('.subtitle')

spec/system/administrateurs/procedure_attestation_template_spec.rb

@@ -25,7 +25,8 @@ describe 'As an administrateur, I want to manage the procedure’s attestation',
     scenario do
       visit admin_procedure_path(procedure)
       # start with no attestation
-      find_attestation_card(with_nested_selector: ".icon.clock")
+      expect(page).to have_content('Désactivée')
+      find_attestation_card(with_nested_selector: ".fr-badge")
 
       # now process to enable attestation
       find_attestation_card.click
@@ -38,7 +39,8 @@ describe 'As an administrateur, I want to manage the procedure’s attestation',
 
       # check attestation
       visit admin_procedure_path(procedure)
-      find_attestation_card(with_nested_selector: ".icon.accept")
+      expect(page).to have_content('Activée')
+      find_attestation_card(with_nested_selector: ".fr-badge--success")
 
       # publish procedure
       # click CTA for publication screen
@@ -54,7 +56,8 @@ describe 'As an administrateur, I want to manage the procedure’s attestation',
 
       # check attestation is now disabled
       visit admin_procedure_path(procedure)
-      find_attestation_card(with_nested_selector: ".icon.clock")
+      expect(page).to have_content('Désactivée')
+      find_attestation_card(with_nested_selector: ".fr-badge")
     end
   end
 end