From 6b20db41629abfaaa20452a650a71e43ea1364f1 Mon Sep 17 00:00:00 2001
From: David Mendy <davebull.dm@gmail.com>
Date: Fri, 31 May 2024 15:14:25 +0200
Subject: [PATCH 1/2] refactor: :recycle: remove isDummyTypology and refactor
 guideFactice

---
 frontend/src/components/ResultPage.vue        | 12 ++++----
 .../utils/firearms-utils/autre-pistolet.ts    |  1 -
 .../epaule-a-levier-sous-garde.ts             |  1 -
 .../utils/firearms-utils/epaule-a-pompe.ts    |  1 -
 .../epaule-a-un-coup-par-canon.ts             |  1 -
 .../utils/firearms-utils/epaule-a-verrou.ts   | 27 ++++++++++--------
 .../epaule-semi-auto-militaire-milieu-20e.ts  |  1 -
 .../epaule-semi-auto-style-chasse.ts          |  1 -
 .../firearms-utils/epaule_mecanisme_ancien.ts |  1 -
 .../pistolet-mecanisme-ancien.ts              |  1 -
 .../pistolet-semi-auto-moderne.ts             | 27 ++++++++++--------
 frontend/src/utils/firearms-utils/revolver.ts | 28 ++++++++++---------
 .../semi-auto-style-militaire-autre.ts        | 27 ++++++++++--------
 .../GuideIdentificationFirearm.vue            |  8 ++----
 .../IdentificationSelectAmmo.vue              |  4 +--
 15 files changed, 71 insertions(+), 70 deletions(-)

diff --git a/frontend/src/components/ResultPage.vue b/frontend/src/components/ResultPage.vue
index 1f6a218f..62b08fb7 100644
--- a/frontend/src/components/ResultPage.vue
+++ b/frontend/src/components/ResultPage.vue
@@ -20,7 +20,7 @@ const img = computed(() => resultStore.img)
 const typology = TYPOLOGIES[resultStore.typology]
 
 const isDummy = computed(() => stepsStore.isDummy)
-const isDummyTypology = computed(() => typology?.isDummyTypology === true)
+const hasGuideDummy = typology?.guideDummy !== undefined
 const isCardDetected = computed(() => resultStore.gunLength !== null && resultStore.gunBarrelLength !== null)
 
 const isUp = ref(false)
@@ -75,7 +75,7 @@ function sendFeedback (isCorrect: boolean) {
   <div class="result-frame -mx-8 py-5 px-8">
     <div class="result">
       <h2
-        v-if="$route.name === 'IdentificationTypologyResult' && isDummyTypology === true"
+        v-if="$route.name === 'IdentificationTypologyResult' && hasGuideDummy"
         class="typology-title bg-white py-4"
       >
         Typologie de l'arme
@@ -144,7 +144,7 @@ function sendFeedback (isCorrect: boolean) {
               >
                 {{ label }}
               </h3>
-              <template v-if="confidenceLevel !== 'low' && ($route.name !== 'IdentificationTypologyResult' || isDummyTypology !== true)">
+              <template v-if="confidenceLevel !== 'low' && ($route.name !== 'IdentificationTypologyResult' || !hasGuideDummy)">
                 <h3
                   class="fr-alert__title"
                   data-testid="arm-category"
@@ -157,14 +157,14 @@ function sendFeedback (isCorrect: boolean) {
               </template>
             </div>
             <div
-              v-if="disclaimer && confidenceLevel !== 'low' && ($route.name !== 'IdentificationTypologyResult' || isDummyTypology !== true)"
+              v-if="disclaimer && confidenceLevel !== 'low' && ($route.name !== 'IdentificationTypologyResult' || !hasGuideDummy)"
               class="fr-alert fr-alert--warning"
             >
               <p v-html="disclaimer" />
             </div>
             <MissingCardAlert v-if="MEASURED_GUNS_TYPOLOGIES.includes(typology) && isCardDetected === false && isDummy == false" />
             <div
-              v-if="confidenceLevel !== 'low' && ($route.name !== 'IdentificationTypologyResult' || isDummyTypology !== true)"
+              v-if="confidenceLevel !== 'low' && ($route.name !== 'IdentificationTypologyResult' || !hasGuideDummy)"
               class="fr-callout mt-3"
             >
               <p class="fr-callout__text">
@@ -178,7 +178,7 @@ function sendFeedback (isCorrect: boolean) {
               </p>
             </div>
             <div
-              v-if="confidenceLevel !== 'low' && $route.name === 'IdentificationTypologyResult' && isDummyTypology"
+              v-if="confidenceLevel !== 'low' && $route.name === 'IdentificationTypologyResult' && hasGuideDummy"
               class="fr-alert fr-alert--warning"
             >
               <p>
diff --git a/frontend/src/utils/firearms-utils/autre-pistolet.ts b/frontend/src/utils/firearms-utils/autre-pistolet.ts
index 1f7e38c2..24c20e28 100644
--- a/frontend/src/utils/firearms-utils/autre-pistolet.ts
+++ b/frontend/src/utils/firearms-utils/autre-pistolet.ts
@@ -17,7 +17,6 @@ export const autre_pistolet = {
   typologie: 'autre_pistolet',
   displayLabel: 'Pistolet divers',
   getCategory: () => 'A, B ou D',
-  isDummyTypology: false,
   options_text: '',
   securingSteps: [
     {
diff --git a/frontend/src/utils/firearms-utils/epaule-a-levier-sous-garde.ts b/frontend/src/utils/firearms-utils/epaule-a-levier-sous-garde.ts
index 730742ad..d0c126ed 100644
--- a/frontend/src/utils/firearms-utils/epaule-a-levier-sous-garde.ts
+++ b/frontend/src/utils/firearms-utils/epaule-a-levier-sous-garde.ts
@@ -11,7 +11,6 @@ Armes d’épaule à levier de sous-garde
 export const epaule_a_levier_sous_garde = {
   displayLabel: "Arme d'épaule à levier de sous-garde",
   getCategory: getCommonCategory,
-  isDummyTypology: false,
   options_text: 'En manipulant l’arme avec précaution dans une <span class="font-bold">direction sans risque</span>, inspectez l’<span class="font-bold">extrémité du tube sous le canon</span>. Sélectionnez ce que vous voyez :',
   securingSteps: [
     {
diff --git a/frontend/src/utils/firearms-utils/epaule-a-pompe.ts b/frontend/src/utils/firearms-utils/epaule-a-pompe.ts
index 9954dfb4..8b1a7d70 100644
--- a/frontend/src/utils/firearms-utils/epaule-a-pompe.ts
+++ b/frontend/src/utils/firearms-utils/epaule-a-pompe.ts
@@ -5,7 +5,6 @@ export const epaule_a_pompe = {
   getCategory: (gunLength: number, gunBarrelLength: number) => {
     if (gunLength && gunBarrelLength) { return gunLength > 75 && gunBarrelLength > 55 ? 'C' : 'B' } else { return 'B ou C' }
   },
-  isDummyTypology: false,
   options_text: '',
   securingSteps: [
     {
diff --git a/frontend/src/utils/firearms-utils/epaule-a-un-coup-par-canon.ts b/frontend/src/utils/firearms-utils/epaule-a-un-coup-par-canon.ts
index b20ea42a..cea1ab63 100644
--- a/frontend/src/utils/firearms-utils/epaule-a-un-coup-par-canon.ts
+++ b/frontend/src/utils/firearms-utils/epaule-a-un-coup-par-canon.ts
@@ -15,7 +15,6 @@ export const epaule_a_un_coup_par_canon = {
   getCategory: (gunLength: number, gunBarrelLength: number) => {
     if (gunLength && gunBarrelLength) { return (gunLength > 75 && gunBarrelLength > 40) ? 'C' : 'B' } else { return 'B ou C' }
   },
-  isDummyTypology: false,
   options_text: 'Sélectionnez ce que vous voyez sur la <span class="font-bold">zone centrale de l’arme</span>',
   securingSteps: [
     {
diff --git a/frontend/src/utils/firearms-utils/epaule-a-verrou.ts b/frontend/src/utils/firearms-utils/epaule-a-verrou.ts
index d0693cda..e8223b31 100644
--- a/frontend/src/utils/firearms-utils/epaule-a-verrou.ts
+++ b/frontend/src/utils/firearms-utils/epaule-a-verrou.ts
@@ -10,7 +10,6 @@ Armes d’épaule à verrou
 export const epaule_a_verrou = {
   displayLabel: 'Arme d’épaule à verrou',
   getCategory: getCommonCategory,
-  isDummyTypology: true,
   securingSteps: [
     {
       options: [
@@ -29,17 +28,21 @@ export const epaule_a_verrou = {
       ],
     },
   ],
-  guideFactice: {
-    cartouches: {
-      label: 'Balles',
-      value: 'cartouches',
-      img_ammo: epauleAVerrouCartridges,
-    },
-    billes: {
-      label: 'Billes ou trou pour billes',
-      value: 'billes',
-      img_ammo: epauleAVerrouBalls,
+  guideDummy: [
+    {
+      options: [
+        {
+          label: 'Balles',
+          value: 'cartouches',
+          img_ammo: epauleAVerrouCartridges,
+        },
+        {
+          label: 'Billes ou trou pour billes',
+          value: 'billes',
+          img_ammo: epauleAVerrouBalls,
+        },
+      ],
     },
-  },
+  ],
   getDisclaimer: getEpaulLevierVerrouDisclaimer,
 } as const
diff --git a/frontend/src/utils/firearms-utils/epaule-semi-auto-militaire-milieu-20e.ts b/frontend/src/utils/firearms-utils/epaule-semi-auto-militaire-milieu-20e.ts
index 479cd8d7..4397a4e3 100644
--- a/frontend/src/utils/firearms-utils/epaule-semi-auto-militaire-milieu-20e.ts
+++ b/frontend/src/utils/firearms-utils/epaule-semi-auto-militaire-milieu-20e.ts
@@ -4,6 +4,5 @@ Armes d’épaule semi-automatiques ou automatiques type militaire milieu 20e
 export const epaule_semi_auto_style_militaire_milieu_20e = {
   displayLabel: 'Arme d’épaule semi-automatique ou automatique',
   getCategory: () => 'A ou B',
-  isDummyTypology: false,
   getDisclaimer: () => "<strong>Catégorie A</strong> si à l'origine l’arme était à <strong>répétition automatique</strong> puis a été <strong>transformée</strong> en arme <strong>semi automatique</strong>, ou si l’arme possède <strong>une crosse rétractable / pliable</strong> et qu’en configuration la plus courte elle <strong>mesure moins de 60 cm</strong>.",
 } as const
diff --git a/frontend/src/utils/firearms-utils/epaule-semi-auto-style-chasse.ts b/frontend/src/utils/firearms-utils/epaule-semi-auto-style-chasse.ts
index 81f850f7..18904e80 100644
--- a/frontend/src/utils/firearms-utils/epaule-semi-auto-style-chasse.ts
+++ b/frontend/src/utils/firearms-utils/epaule-semi-auto-style-chasse.ts
@@ -11,7 +11,6 @@ Armes d’épaule semi-automatiques ou automatiques type chasse
 export const epaule_semi_auto_style_chasse = {
   displayLabel: 'Arme d’épaule semi-automatique',
   getCategory: getCommonCategory,
-  isDummyTypology: false,
   getDisclaimer: (category: string, isCardDetected: boolean) => {
     if (['B ou C', 'C'].includes(category)) {
       if (isCardDetected === false) {
diff --git a/frontend/src/utils/firearms-utils/epaule_mecanisme_ancien.ts b/frontend/src/utils/firearms-utils/epaule_mecanisme_ancien.ts
index a9b96088..275f3704 100644
--- a/frontend/src/utils/firearms-utils/epaule_mecanisme_ancien.ts
+++ b/frontend/src/utils/firearms-utils/epaule_mecanisme_ancien.ts
@@ -4,5 +4,4 @@ Armes d’épaule à mécanisme ancien
 export const epaule_mecanisme_ancien = {
   displayLabel: "Arme d'épaule à mécanisme ancien",
   getCategory: () => 'D',
-  isDummyTypology: false,
 } as const
diff --git a/frontend/src/utils/firearms-utils/pistolet-mecanisme-ancien.ts b/frontend/src/utils/firearms-utils/pistolet-mecanisme-ancien.ts
index bbd1e49b..fb1bda98 100644
--- a/frontend/src/utils/firearms-utils/pistolet-mecanisme-ancien.ts
+++ b/frontend/src/utils/firearms-utils/pistolet-mecanisme-ancien.ts
@@ -4,5 +4,4 @@ Pistolet à mécanisme ancien
 export const pistolet_mecanisme_ancien = {
   displayLabel: 'Pistolet à mécanisme ancien',
   getCategory: () => 'D',
-  isDummyTypology: false,
 } as const
diff --git a/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts b/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts
index ae03cf96..a61de593 100644
--- a/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts
+++ b/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts
@@ -12,7 +12,6 @@ Pistolets semi-auto modernes
 export const pistolet_semi_auto_moderne = {
   displayLabel: 'Pistolet semi-automatique',
   getCategory: () => 'B',
-  isDummyTypology: true,
   pistolet_semi_auto_moderne_text_option: 'Sélectionner ce que vous voyez sur votre arme : <span class="font-bold">bouton à proximité du pontet du côté gauche de la poignée</span>, OU <span class="font-bold">bouton sur le talon</span> de la crosse.',
   textOptions: '',
   securingSteps: [
@@ -51,18 +50,22 @@ export const pistolet_semi_auto_moderne = {
       ],
     },
   ],
-  guideFactice: {
-    cartouche: {
-      label: 'Cartouches',
-      value: 'cartouches',
-      img_ammo: pistoletSemiAutoModerneCartridges,
-    },
-    billes: {
-      label: 'Billes',
-      value: 'billes',
-      img_ammo: pistoletSemiAutoModerneBalls,
+  guideDummy: [
+    {
+      options: [
+        {
+          label: 'Cartouches',
+          value: 'cartouches',
+          img_ammo: pistoletSemiAutoModerneCartridges,
+        },
+        {
+          label: 'Billes',
+          value: 'billes',
+          img_ammo: pistoletSemiAutoModerneBalls,
+        },
+      ],
     },
-  },
+  ],
   getDisclaimer: (category: string) => {
     if (category === 'D') {
       return 'Les <strong>armes d’alarmes</strong> sont susceptibles d’être <strong>modifiées pour tirer des munitions létales</strong>. Pour des raisons de sécurité, <strong>faites si possible expertiser l’arme.</strong>'
diff --git a/frontend/src/utils/firearms-utils/revolver.ts b/frontend/src/utils/firearms-utils/revolver.ts
index d8bc60ec..c567528b 100644
--- a/frontend/src/utils/firearms-utils/revolver.ts
+++ b/frontend/src/utils/firearms-utils/revolver.ts
@@ -32,7 +32,6 @@ export const revolver = {
   displayLabel: 'Revolver',
   getCategory: () => 'B',
   categoryWithoutSecuring: 'B ou D',
-  isDummyTypology: true,
   securingSteps: [
     {
       text: 'En maintenant l’arme dans une  <span class="font-bold">direction sécurisée</span> , sélectionnez ce que vous voyez.',
@@ -164,18 +163,22 @@ export const revolver = {
       ],
     },
   ],
-  guideFactice: {
-    cartouches: {
-      label: 'Balles',
-      value: 'cartouches',
-      img_ammo: revolverCartridges,
-    },
-    billes: {
-      label: 'Billes ou trou pour billes',
-      value: 'billes',
-      img_ammo: revolverBalls,
+  guideDummy: [
+    {
+      options: [
+        {
+          label: 'Balles',
+          value: 'cartouches',
+          img_ammo: revolverCartridges,
+        },
+        {
+          label: 'Billes ou trou pour billes',
+          value: 'billes',
+          img_ammo: revolverBalls,
+        },
+      ],
     },
-  },
+  ],
   getDisclaimer: (category: string) => {
     if (category === 'D') {
       return 'Les <strong>armes d’alarmes</strong> sont susceptibles d’être <strong>modifiées pour tirer des munitions létales</strong>. Pour des raisons de sécurité, <strong>faites si possible expertiser l’arme.</strong>'
@@ -186,5 +189,4 @@ export const revolver = {
 export const revolver_black_powder = {
   displayLabel: 'Revolver à poudre noire',
   getCategory: () => 'D',
-  isDummyTypology: false,
 } as const
diff --git a/frontend/src/utils/firearms-utils/semi-auto-style-militaire-autre.ts b/frontend/src/utils/firearms-utils/semi-auto-style-militaire-autre.ts
index 476feeb8..324d0837 100644
--- a/frontend/src/utils/firearms-utils/semi-auto-style-militaire-autre.ts
+++ b/frontend/src/utils/firearms-utils/semi-auto-style-militaire-autre.ts
@@ -21,7 +21,6 @@ Armes d’épaule semi-automatiques ou automatiques type militaire moderne
 export const semi_auto_style_militaire_autre = {
   displayLabel: 'Arme semi-automatique ou automatique',
   getCategory: () => 'A ou B',
-  isDummyTypology: true,
   securingSteps: [
     {
       text: 'Observez la position du chargeur et sélectionnez ce que vous voyez :',
@@ -102,17 +101,21 @@ export const semi_auto_style_militaire_autre = {
       ],
     },
   ],
-  guideFactice: {
-    cartouches: {
-      label: 'Cartouches',
-      value: 'cartouches',
-      img_ammo: semiAutoMilitaireCartridges,
-    },
-    billes: {
-      label: 'Billes',
-      value: 'billes',
-      img_ammo: semiAutoMilitaireBalls,
+  guideDummy: [
+    {
+      options: [
+        {
+          label: 'Cartouches',
+          value: 'cartouches',
+          img_ammo: semiAutoMilitaireCartridges,
+        },
+        {
+          label: 'Billes',
+          value: 'billes',
+          img_ammo: semiAutoMilitaireBalls,
+        },
+      ],
     },
-  },
+  ],
   getDisclaimer: () => "<strong>Catégorie A</strong> si à l'origine l’arme était à <strong>répétition automatique</strong> puis a été <strong>transformée</strong> en arme <strong>semi automatique</strong>, ou si l’arme possède <strong>une crosse rétractable / pliable</strong> et qu’en configuration la plus courte elle <strong>mesure moins de 60 cm</strong>.",
 } as const
diff --git a/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue b/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue
index 535d57e7..c0a398c5 100644
--- a/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue
+++ b/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue
@@ -20,12 +20,10 @@ const confidenceLevel = computed(() => resultStore.confidenceLevel)
 const typology = computed(() => resultStore.typology)
 
 const currentStep = ref(1)
-
-const isDummyTypology = TYPOLOGIES[resultStore.typology].isDummyTypology
 const isLowConfidence = confidenceLevel.value === 'low'
 
 const steps = computed(() => {
-  if (isDummyTypology || !isLowConfidence) {
+  if (TYPOLOGIES[typology]?.guideDummy || !isLowConfidence) {
     if (ALARM_GUNS_TYPOLOGIES.includes(resultStore.typology) && stepsStore.selectedAmmo === 'cartouches') {
       return ['Typologie de l\'arme', 'Compléments', 'Typologie de munitions', 'Identification d\'une arme d\'alarme', 'Résultat final']
     } else {
@@ -99,7 +97,7 @@ const showDiv = ref(false)
   <div class="mt-5 fr-container">
     <div class="result fr-col-11 fr-col-lg-6 mx-auto">
       <StepsGuide
-        v-if="TYPOLOGIES[typology]?.isDummyTypology"
+        v-if="TYPOLOGIES[typology]?.guideDummy"
         class="!fr-container my-auto"
         :steps="steps"
         :current-step="currentStep"
@@ -108,7 +106,7 @@ const showDiv = ref(false)
     </div>
   </div>
   <div
-    v-if="$route.path === '/guide-identification/resultat-final' || !TYPOLOGIES[typology]?.isDummyTypology"
+    v-if="$route.path === '/guide-identification/resultat-final' || TYPOLOGIES[typology]?.guideDummy == undefined"
     class="footer end z-1"
   >
     <div class="fr-col-11 fr-col-lg-6 mx-auto">
diff --git a/frontend/src/views/GuideIdentificationFirearm/IdentificationSelectAmmo.vue b/frontend/src/views/GuideIdentificationFirearm/IdentificationSelectAmmo.vue
index 48172478..6624de1a 100644
--- a/frontend/src/views/GuideIdentificationFirearm/IdentificationSelectAmmo.vue
+++ b/frontend/src/views/GuideIdentificationFirearm/IdentificationSelectAmmo.vue
@@ -52,7 +52,7 @@ onMounted(() => {
 })
 
 // eslint-disable-next-line camelcase
-type HasGuideFactice = typeof epaule_a_verrou | typeof pistolet_semi_auto_moderne | typeof semi_auto_style_militaire_autre | typeof revolver
+type HasGuideDummy = typeof epaule_a_verrou | typeof pistolet_semi_auto_moderne | typeof semi_auto_style_militaire_autre | typeof revolver
 </script>
 
 <template>
@@ -123,7 +123,7 @@ type HasGuideFactice = typeof epaule_a_verrou | typeof pistolet_semi_auto_modern
     </div>
     <div>
       <template
-        v-for="option of (TYPOLOGIES[typology] as HasGuideFactice)?.guideFactice"
+        v-for="(option) in (TYPOLOGIES[typology] as HasGuideDummy)?.guideDummy[0].options"
         :key="option.value"
       >
         <div class="item">

From e98cacd63461ef0f1c4f9344d6f4f71739154c02 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <thomashbernard@gmail.com>
Date: Fri, 31 May 2024 20:04:51 +0200
Subject: [PATCH 2/2] Standardize securing footer

---
 frontend/src/components/ResultPage.vue        | 12 +++++-----
 .../utils/firearms-utils/epaule-a-verrou.ts   | 22 ++++++++-----------
 .../pistolet-semi-auto-moderne.ts             | 22 ++++++++-----------
 frontend/src/utils/firearms-utils/revolver.ts | 22 ++++++++-----------
 .../semi-auto-style-militaire-autre.ts        | 22 ++++++++-----------
 .../GuideIdentificationFirearm.vue            |  6 ++---
 .../IdentificationSelectAmmo.vue              |  4 ++--
 7 files changed, 47 insertions(+), 63 deletions(-)

diff --git a/frontend/src/components/ResultPage.vue b/frontend/src/components/ResultPage.vue
index 62b08fb7..1340bc3b 100644
--- a/frontend/src/components/ResultPage.vue
+++ b/frontend/src/components/ResultPage.vue
@@ -20,7 +20,7 @@ const img = computed(() => resultStore.img)
 const typology = TYPOLOGIES[resultStore.typology]
 
 const isDummy = computed(() => stepsStore.isDummy)
-const hasGuideDummy = typology?.guideDummy !== undefined
+const hasDummyOptions = typology?.dummyOptions !== undefined
 const isCardDetected = computed(() => resultStore.gunLength !== null && resultStore.gunBarrelLength !== null)
 
 const isUp = ref(false)
@@ -75,7 +75,7 @@ function sendFeedback (isCorrect: boolean) {
   <div class="result-frame -mx-8 py-5 px-8">
     <div class="result">
       <h2
-        v-if="$route.name === 'IdentificationTypologyResult' && hasGuideDummy"
+        v-if="$route.name === 'IdentificationTypologyResult' && hasDummyOptions"
         class="typology-title bg-white py-4"
       >
         Typologie de l'arme
@@ -144,7 +144,7 @@ function sendFeedback (isCorrect: boolean) {
               >
                 {{ label }}
               </h3>
-              <template v-if="confidenceLevel !== 'low' && ($route.name !== 'IdentificationTypologyResult' || !hasGuideDummy)">
+              <template v-if="confidenceLevel !== 'low' && ($route.name !== 'IdentificationTypologyResult' || !hasDummyOptions)">
                 <h3
                   class="fr-alert__title"
                   data-testid="arm-category"
@@ -157,14 +157,14 @@ function sendFeedback (isCorrect: boolean) {
               </template>
             </div>
             <div
-              v-if="disclaimer && confidenceLevel !== 'low' && ($route.name !== 'IdentificationTypologyResult' || !hasGuideDummy)"
+              v-if="disclaimer && confidenceLevel !== 'low' && ($route.name !== 'IdentificationTypologyResult' || !hasDummyOptions)"
               class="fr-alert fr-alert--warning"
             >
               <p v-html="disclaimer" />
             </div>
             <MissingCardAlert v-if="MEASURED_GUNS_TYPOLOGIES.includes(typology) && isCardDetected === false && isDummy == false" />
             <div
-              v-if="confidenceLevel !== 'low' && ($route.name !== 'IdentificationTypologyResult' || !hasGuideDummy)"
+              v-if="confidenceLevel !== 'low' && ($route.name !== 'IdentificationTypologyResult' || !hasDummyOptions)"
               class="fr-callout mt-3"
             >
               <p class="fr-callout__text">
@@ -178,7 +178,7 @@ function sendFeedback (isCorrect: boolean) {
               </p>
             </div>
             <div
-              v-if="confidenceLevel !== 'low' && $route.name === 'IdentificationTypologyResult' && hasGuideDummy"
+              v-if="confidenceLevel !== 'low' && $route.name === 'IdentificationTypologyResult' && hasDummyOptions"
               class="fr-alert fr-alert--warning"
             >
               <p>
diff --git a/frontend/src/utils/firearms-utils/epaule-a-verrou.ts b/frontend/src/utils/firearms-utils/epaule-a-verrou.ts
index e8223b31..56f4bd2d 100644
--- a/frontend/src/utils/firearms-utils/epaule-a-verrou.ts
+++ b/frontend/src/utils/firearms-utils/epaule-a-verrou.ts
@@ -28,20 +28,16 @@ export const epaule_a_verrou = {
       ],
     },
   ],
-  guideDummy: [
+  dummyOptions: [
     {
-      options: [
-        {
-          label: 'Balles',
-          value: 'cartouches',
-          img_ammo: epauleAVerrouCartridges,
-        },
-        {
-          label: 'Billes ou trou pour billes',
-          value: 'billes',
-          img_ammo: epauleAVerrouBalls,
-        },
-      ],
+      label: 'Balles',
+      value: 'cartouches',
+      img_ammo: epauleAVerrouCartridges,
+    },
+    {
+      label: 'Billes ou trou pour billes',
+      value: 'billes',
+      img_ammo: epauleAVerrouBalls,
     },
   ],
   getDisclaimer: getEpaulLevierVerrouDisclaimer,
diff --git a/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts b/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts
index a61de593..6c52be97 100644
--- a/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts
+++ b/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts
@@ -50,20 +50,16 @@ export const pistolet_semi_auto_moderne = {
       ],
     },
   ],
-  guideDummy: [
+  dummyOptions: [
     {
-      options: [
-        {
-          label: 'Cartouches',
-          value: 'cartouches',
-          img_ammo: pistoletSemiAutoModerneCartridges,
-        },
-        {
-          label: 'Billes',
-          value: 'billes',
-          img_ammo: pistoletSemiAutoModerneBalls,
-        },
-      ],
+      label: 'Cartouches',
+      value: 'cartouches',
+      img_ammo: pistoletSemiAutoModerneCartridges,
+    },
+    {
+      label: 'Billes',
+      value: 'billes',
+      img_ammo: pistoletSemiAutoModerneBalls,
     },
   ],
   getDisclaimer: (category: string) => {
diff --git a/frontend/src/utils/firearms-utils/revolver.ts b/frontend/src/utils/firearms-utils/revolver.ts
index c567528b..b0da961e 100644
--- a/frontend/src/utils/firearms-utils/revolver.ts
+++ b/frontend/src/utils/firearms-utils/revolver.ts
@@ -163,20 +163,16 @@ export const revolver = {
       ],
     },
   ],
-  guideDummy: [
+  dummyOptions: [
     {
-      options: [
-        {
-          label: 'Balles',
-          value: 'cartouches',
-          img_ammo: revolverCartridges,
-        },
-        {
-          label: 'Billes ou trou pour billes',
-          value: 'billes',
-          img_ammo: revolverBalls,
-        },
-      ],
+      label: 'Balles',
+      value: 'cartouches',
+      img_ammo: revolverCartridges,
+    },
+    {
+      label: 'Billes ou trou pour billes',
+      value: 'billes',
+      img_ammo: revolverBalls,
     },
   ],
   getDisclaimer: (category: string) => {
diff --git a/frontend/src/utils/firearms-utils/semi-auto-style-militaire-autre.ts b/frontend/src/utils/firearms-utils/semi-auto-style-militaire-autre.ts
index 324d0837..744cc2e6 100644
--- a/frontend/src/utils/firearms-utils/semi-auto-style-militaire-autre.ts
+++ b/frontend/src/utils/firearms-utils/semi-auto-style-militaire-autre.ts
@@ -101,20 +101,16 @@ export const semi_auto_style_militaire_autre = {
       ],
     },
   ],
-  guideDummy: [
+  dummyOptions: [
     {
-      options: [
-        {
-          label: 'Cartouches',
-          value: 'cartouches',
-          img_ammo: semiAutoMilitaireCartridges,
-        },
-        {
-          label: 'Billes',
-          value: 'billes',
-          img_ammo: semiAutoMilitaireBalls,
-        },
-      ],
+      label: 'Cartouches',
+      value: 'cartouches',
+      img_ammo: semiAutoMilitaireCartridges,
+    },
+    {
+      label: 'Billes',
+      value: 'billes',
+      img_ammo: semiAutoMilitaireBalls,
     },
   ],
   getDisclaimer: () => "<strong>Catégorie A</strong> si à l'origine l’arme était à <strong>répétition automatique</strong> puis a été <strong>transformée</strong> en arme <strong>semi automatique</strong>, ou si l’arme possède <strong>une crosse rétractable / pliable</strong> et qu’en configuration la plus courte elle <strong>mesure moins de 60 cm</strong>.",
diff --git a/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue b/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue
index c0a398c5..6284d077 100644
--- a/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue
+++ b/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue
@@ -23,7 +23,7 @@ const currentStep = ref(1)
 const isLowConfidence = confidenceLevel.value === 'low'
 
 const steps = computed(() => {
-  if (TYPOLOGIES[typology]?.guideDummy || !isLowConfidence) {
+  if (TYPOLOGIES[typology]?.dummyOptions || !isLowConfidence) {
     if (ALARM_GUNS_TYPOLOGIES.includes(resultStore.typology) && stepsStore.selectedAmmo === 'cartouches') {
       return ['Typologie de l\'arme', 'Compléments', 'Typologie de munitions', 'Identification d\'une arme d\'alarme', 'Résultat final']
     } else {
@@ -97,7 +97,7 @@ const showDiv = ref(false)
   <div class="mt-5 fr-container">
     <div class="result fr-col-11 fr-col-lg-6 mx-auto">
       <StepsGuide
-        v-if="TYPOLOGIES[typology]?.guideDummy"
+        v-if="TYPOLOGIES[typology]?.dummyOptions"
         class="!fr-container my-auto"
         :steps="steps"
         :current-step="currentStep"
@@ -106,7 +106,7 @@ const showDiv = ref(false)
     </div>
   </div>
   <div
-    v-if="$route.path === '/guide-identification/resultat-final' || TYPOLOGIES[typology]?.guideDummy == undefined"
+    v-if="$route.path === '/guide-identification/resultat-final' || TYPOLOGIES[typology]?.dummyOptions == undefined"
     class="footer end z-1"
   >
     <div class="fr-col-11 fr-col-lg-6 mx-auto">
diff --git a/frontend/src/views/GuideIdentificationFirearm/IdentificationSelectAmmo.vue b/frontend/src/views/GuideIdentificationFirearm/IdentificationSelectAmmo.vue
index 6624de1a..3bcf0e72 100644
--- a/frontend/src/views/GuideIdentificationFirearm/IdentificationSelectAmmo.vue
+++ b/frontend/src/views/GuideIdentificationFirearm/IdentificationSelectAmmo.vue
@@ -52,7 +52,7 @@ onMounted(() => {
 })
 
 // eslint-disable-next-line camelcase
-type HasGuideDummy = typeof epaule_a_verrou | typeof pistolet_semi_auto_moderne | typeof semi_auto_style_militaire_autre | typeof revolver
+type HasDummyOptions = typeof epaule_a_verrou | typeof pistolet_semi_auto_moderne | typeof semi_auto_style_militaire_autre | typeof revolver
 </script>
 
 <template>
@@ -123,7 +123,7 @@ type HasGuideDummy = typeof epaule_a_verrou | typeof pistolet_semi_auto_moderne
     </div>
     <div>
       <template
-        v-for="(option) in (TYPOLOGIES[typology] as HasGuideDummy)?.guideDummy[0].options"
+        v-for="(option) in (TYPOLOGIES[typology] as HasDummyOptions)?.dummyOptions"
         :key="option.value"
       >
         <div class="item">