Merge pull request #183 from datalab-mi/enh/refactoring-selectoption-…

…component [WIP] enh: ♻️ refactoring selectoption component
dnum-mi · Sep 25, 2023 · 3a0f386 · 3a0f386
2 parents 9728f02 + 9f2d8fe
commit 3a0f386
Show file tree

Hide file tree

Showing 21 changed files with 412 additions and 221 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -29,11 +29,11 @@
     "vue-router": "^4.2.4"
   },
   "devDependencies": {
-    "@testing-library/cypress": "^9.0.0",
+    "@testing-library/cypress": "^10.0.1",
     "@unocss/transformer-directives": "^0.55.7",
     "@unocss/transformer-variant-group": "^0.55.7",
     "@vitejs/plugin-vue": "^4.3.4",
-    "cypress": "^12.17.4",
+    "cypress": "^13.2.0",
     "eslint": "^8.48.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-cypress": "^2.14.0",

diff --git a/...-mise-en-securite/photos/epaule_a_un_coup_par_canon/ep_un_coup_cle_oreilles.jpg b/...-mise-en-securite/photos/epaule_a_un_coup_par_canon/ep_un_coup_cle_oreilles.jpg
diff --git a/...rite/photos/epaule_a_un_coup_par_canon/epaule_a_un_coup_par_canon_cle_darne.jpg b/...rite/photos/epaule_a_un_coup_par_canon/epaule_a_un_coup_par_canon_cle_darne.jpg
diff --git a/...mise-en-securite/photos/epaule_a_un_coup_par_canon/epaule_un_coup_cle_darne.jpg b/...mise-en-securite/photos/epaule_a_un_coup_par_canon/epaule_un_coup_cle_darne.jpg
diff --git a/...en-securite/photos/epaule_a_un_coup_par_canon/epaule_un_coup_cle_lefaucheux.jpg b/...en-securite/photos/epaule_a_un_coup_par_canon/epaule_un_coup_cle_lefaucheux.jpg
diff --git a/...mise-en-securite/photos/epaule_a_un_coup_par_canon/epaule_un_coup_cle_pouce.jpg b/...mise-en-securite/photos/epaule_a_un_coup_par_canon/epaule_un_coup_cle_pouce.jpg
diff --git a/frontend/src/components/AskingExpert.vue b/frontend/src/components/AskingExpert.vue
@@ -31,7 +31,7 @@ async function sendTutorialFeedback () {
     image_url: imgUrl.value,
     tutorial_feedback: stepsStore.tutorialFeedback,
     label: typology.value,
-    tutorial_option: stepsStore.selectedOptionStep2 || null,
+    tutorial_option: stepsStore.selectedOptionStep || null,
     route_name: route.name,
     confidence: confidence.value,
     confidence_level: confidenceLevel.value,

diff --git a/frontend/src/components/UploadButton.vue b/frontend/src/components/UploadButton.vue
@@ -53,13 +53,13 @@ async function submitUpload (base64, fileName) {
     // TODO: Afficher l’erreur à l’utilisateur
     router.push({ name: 'ErrorPage', meta: { error } })
   } finally {
-    router.push({
-      name: getNextRouteAfterResult({
-        securingTutorial: resultStore.securingTutorial,
-        confidenceLevel: resultStore.confidenceLevel,
-        typology: resultStore.typology,
-      }),
+    const nextRoute = getNextRouteAfterResult({
+      securingTutorial: resultStore.securingTutorial,
+      confidenceLevel: resultStore.confidenceLevel,
+      typology: resultStore.typology,
     })
+    console.log('nextRoute', nextRoute)
+    router.push(nextRoute)
   }
 }
 

diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
@@ -15,9 +15,7 @@ const ContactPage = () => import('@/views/ContactPage.vue')
 const GuideSecuringFirearm = () => import('@/views/GuideSecuringFirearm/GuideSecuringFirearm.vue')
 const SecuringIntroduction = () => import('@/views/GuideSecuringFirearm/SecuringIntroduction.vue')
 const SecuringInstructions = () => import('@/views/GuideSecuringFirearm/SecuringInstructions.vue')
-const SecuringSelectOptionStep1 = () => import('@/views/GuideSecuringFirearm/SecuringSelectOptionStep1.vue')
-const SecuringSelectOptionStep3 = () => import('@/views/GuideSecuringFirearm/SecuringSelectOptionStep3.vue')
-const SecuringSelectOptionStep2 = () => import('@/views/GuideSecuringFirearm/SecuringSelectOptionStep2.vue')
+const SecuringSelectOptionContent = () => import('@/views/GuideSecuringFirearm/SecuringSelectOptionContent.vue')
 const SecuringTutorialContent = () => import('@/views/GuideSecuringFirearm/SecuringTutorialContent.vue')
 const SecuringRecommendations = () => import('@/views/GuideSecuringFirearm/SecuringRecommendations.vue')
 const SecuringAchievement = () => import('@/views/GuideSecuringFirearm/SecuringAchievement.vue')
@@ -76,19 +74,10 @@ const routes = [
     ],
   },
   {
-    path: '/mise-en-securite-choix-option-etape-1',
-    name: 'SecuringSelectOptionStep1',
-    component: SecuringSelectOptionStep1,
-  },
-  {
-    path: '/mise-en-securite-choix-option-etape-2',
-    name: 'SecuringSelectOptionStep2',
-    component: SecuringSelectOptionStep2,
-  },
-  {
-    path: '/mise-en-securite-choix-option-etape-3',
-    name: 'SecuringSelectOptionStep3',
-    component: SecuringSelectOptionStep3,
+    path: '/mise-en-securite-choix-option-etape/:step',
+    name: 'SecuringSelectOption',
+    component: SecuringSelectOptionContent,
+    props: true,
   },
   {
     path: '/mise-en-securite-tutoriel',

diff --git a/frontend/src/stores/result.js b/frontend/src/stores/result.js
@@ -31,8 +31,8 @@ export const useResultStore = defineStore('result', () => {
     geolocation.value = geoloc
   }
 
-  const updateTypology = (selectedOptionStep1) => {
-    typology.value = typology.value + (selectedOptionStep1 === 'revolver_black_powder' ? '_black_powder' : '')
+  const updateTypology = (selectedOptionStep) => {
+    typology.value = typology.value + (selectedOptionStep === 'revolver_black_powder' ? '_black_powder' : '')
   }
 
   return {