From 6e5b4d72f94dd32f9ae8e2b87cfdeeec01b179e7 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <thomashbernard@gmail.com>
Date: Tue, 28 May 2024 11:22:08 +0200
Subject: [PATCH] Refactor category handling

---
 frontend/src/components/ResultPage.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/ResultPage.vue b/frontend/src/components/ResultPage.vue
index 2d4433e0..1f6a218f 100644
--- a/frontend/src/components/ResultPage.vue
+++ b/frontend/src/components/ResultPage.vue
@@ -17,31 +17,31 @@ const confidence = computed(() => resultStore.confidence)
 const confidenceLevel = computed(() => resultStore.confidenceLevel)
 const img = computed(() => resultStore.img)
 
-const typology = computed(() => resultStore.typology)
+const typology = TYPOLOGIES[resultStore.typology]
 
 const isDummy = computed(() => stepsStore.isDummy)
-const isDummyTypology = computed(() => TYPOLOGIES[typology.value]?.isDummyTypology === true)
+const isDummyTypology = computed(() => typology?.isDummyTypology === true)
 const isCardDetected = computed(() => resultStore.gunLength !== null && resultStore.gunBarrelLength !== null)
 
 const isUp = ref(false)
 const isDown = ref(false)
 const isFeedbackDone = ref(false)
 
-const label = computed(() => TYPOLOGIES[typology.value]?.displayLabel)
+const label = computed(() => typology?.displayLabel)
 
 const category = computed(() => {
   if (stepsStore.selectedAlarmGun && stepsStore.selectedAlarmGun !== '') {
     return 'D'
   } else if (isDummy.value) {
     return 'Non Classée'
-  } else if (typology.value === 'revolver') {
-    return TYPOLOGIES[typology.value]?.categoryWithoutSecuring
+  } else if (typology.displayLabel === 'Revolver') {
+    return typology?.categoryWithoutSecuring
   } else {
-    return TYPOLOGIES[typology.value]?.getCategory(resultStore.gunLength, resultStore.gunBarrelLength)
+    return typology?.getCategory(resultStore.gunLength, resultStore.gunBarrelLength)
   }
 })
 
-const disclaimer = computed(() => TYPOLOGIES[typology.value] && Object.hasOwn(TYPOLOGIES[typology.value], 'getDisclaimer') ? TYPOLOGIES[typology.value].getDisclaimer(category.value, isCardDetected.value) : null)
+const disclaimer = computed(() => typology && Object.hasOwn(typology, 'getDisclaimer') ? typology.getDisclaimer(category.value, isCardDetected.value) : null)
 
 function sendFeedback (isCorrect: boolean) {
   const json = {