From 511d3b27a74b92de55aeb2ff7992d8cc824c44cc Mon Sep 17 00:00:00 2001
From: Thomas Bernard <thomashbernard@gmail.com>
Date: Wed, 5 Jun 2024 12:08:58 +0200
Subject: [PATCH] Refactor black powder revolver path

---
 frontend/src/utils/firearms-utils/index.ts       |  3 +--
 frontend/src/utils/firearms-utils/revolver.ts    |  4 ++++
 .../GuideSecuringFirearm/SecuringAchievement.vue |  2 +-
 .../SecuringSelectOptionContent.vue              | 16 ++--------------
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/frontend/src/utils/firearms-utils/index.ts b/frontend/src/utils/firearms-utils/index.ts
index 0ed4d2d2..604dab08 100644
--- a/frontend/src/utils/firearms-utils/index.ts
+++ b/frontend/src/utils/firearms-utils/index.ts
@@ -1,4 +1,4 @@
-import { revolver, revolver_black_powder } from './revolver'
+import { revolver } from './revolver'
 import { pistolet_semi_auto_moderne } from './pistolet-semi-auto-moderne'
 import { epaule_a_un_coup_par_canon } from './epaule-a-un-coup-par-canon'
 import { epaule_a_verrou } from './epaule-a-verrou'
@@ -24,7 +24,6 @@ export const TYPOLOGIES = {
   pistolet_mecanisme_ancien,
   pistolet_semi_auto_moderne,
   revolver,
-  revolver_black_powder,
   semi_auto_style_militaire_autre,
   arme_alarme,
 } as const
diff --git a/frontend/src/utils/firearms-utils/revolver.ts b/frontend/src/utils/firearms-utils/revolver.ts
index b0da961e..52db1569 100644
--- a/frontend/src/utils/firearms-utils/revolver.ts
+++ b/frontend/src/utils/firearms-utils/revolver.ts
@@ -18,6 +18,10 @@ import revolver31892Img from '@/assets/guide-mise-en-securite/photos/revolver/re
 import revolver31892Video from '@/assets/guide-mise-en-securite/videos/revolver/revolver_1892.mp4'
 import revolverCartridges from '@/assets/guide-identification/photos/revolver/revolver_cartouche_pleine.jpg'
 import revolverBalls from '@/assets/guide-identification/photos/revolver/revolver_cartouche_bille.jpg'
+
+import { useStore } from '@/stores/steps'
+const store = useStore()
+
 /*
 Revolvers
   Revolver Enfield - Webley - brisure
diff --git a/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue b/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue
index 0c909385..f0e4b4e7 100644
--- a/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue
+++ b/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue
@@ -22,7 +22,7 @@ function goToMissingCardPageIfMissing () {
 <template>
   <div class="fr-container">
     <div class="result fr-col-11 fr-col-lg-6 m-auto">
-      <div v-if="TYPOLOGIES[typology]?.securingSteps">
+      <div v-if="TYPOLOGIES[typology]?.securingSteps && store.selectedOptions[0] !== 'revolver_black_powder'">
         <h1 class="mt-5 text-center">
           Fin de la mise en sécurité de l’arme
         </h1>
diff --git a/frontend/src/views/GuideSecuringFirearm/SecuringSelectOptionContent.vue b/frontend/src/views/GuideSecuringFirearm/SecuringSelectOptionContent.vue
index 8c35d402..c7df89a6 100644
--- a/frontend/src/views/GuideSecuringFirearm/SecuringSelectOptionContent.vue
+++ b/frontend/src/views/GuideSecuringFirearm/SecuringSelectOptionContent.vue
@@ -29,7 +29,7 @@ const selectedOptionValue = computed({
   },
 })
 
-const disabledValidation = computed(() => stepsStore.selectedOptions[props.step - 1] === undefined)
+const disabledValidation = computed(() => store.selectedOptions[props.step - 1] === undefined)
 
 const zoom = ref('')
 
@@ -37,13 +37,6 @@ const zoomOn = (imgValue: string) => {
   zoom.value = imgValue
 }
 
-function updateTypology () {
-  if (props.step === 1 && selectedOptionValue.value === 'revolver_black_powder') {
-    // Remember if it is a revolver with black powder
-    resultStore.updateTypology(selectedOptionValue.value)
-  }
-}
-
 const nextTo = computed(() => {
   if (typology.displayLabel === 'Revolver') {
     if (props.step === 1) {
@@ -74,11 +67,6 @@ const nextTo = computed(() => {
   }
 })
 
-function nextClick () {
-  updateTypology()
-  router.push(nextTo.value)
-}
-
 </script>
 
 <template>
@@ -164,7 +152,7 @@ function nextClick () {
     <SecuringFooter
       :next-disabled="disabledValidation"
       @back-click="$router.back()"
-      @next-click="nextClick"
+      @next-click="$router.push(nextTo)"
     />
   </div>
 </template>