conflit

Author: JulioManoel

package-lock.json

@@ -33,7 +33,7 @@
     "@tiptap/vue-3": "^2.27.2",
     "@vue/babel-plugin-jsx": "^2.0.1",
     "@vueup/vue-quill": "^1.5.3",
-    "axios": "^1.17.0",
+    "axios": "^1.18.0",
     "buffer": "^6.0.3",
     "chart.js": "^4.5.1",
     "chartjs-adapter-date-fns": "^3.0.0",
@@ -49,9 +49,9 @@
     "process": "^0.11.10",
     "stream-browserify": "^3.0.0",
     "uid-generator": "^2.0.0",
-    "vue": "^3.5.30",
+    "vue": "^3.5.38",
     "vue-chartjs": "^5.3.3",
-    "vue-i18n": "^11.4.5",
+    "vue-i18n": "^11.4.6",
     "vue-loader": "^17.4.2",
     "vue-router": "^4.6.4",
     "vue-toastification": "^2.0.0-rc.5",
@@ -60,7 +60,7 @@
     "vuedraggable": "^4.1.0",
     "vuetify": "^3.12.8",
     "vuex": "^4.0.2",
-    "wavesurfer.js": "^7.12.3"
+    "wavesurfer.js": "^7.12.8"
   },
   "devDependencies": {
     "@babel/core": "^7.29.0",
@@ -76,21 +76,21 @@
     "@vue/cli-plugin-unit-jest": "^5.0.8",
     "@vue/cli-plugin-vuex": "^5.0.8",
     "@vue/cli-service": "^5.0.8",
-    "@vue/compiler-sfc": "^3.5.32",
+    "@vue/compiler-sfc": "^3.5.39",
     "@vue/test-utils": "^2.4.11",
     "@vue/vue3-jest": "^27.0.0",
     "babel-plugin-transform-require-context": "^0.1.1",
-    "cypress": "^15.11.0",
+    "cypress": "^15.18.0",
     "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-vue": "^10.9.2",
     "eslint-plugin-vuetify": "^2.7.2",
-    "globals": "^17.5.0",
+    "globals": "^17.7.0",
     "husky": "^9.1.7",
     "jsdoc": "^4.0.5",
     "jsdoc-vuex-plugin": "^1.0.0",
-    "lint-staged": "^17.0.7",
-    "prettier": "^3.8.2",
+    "lint-staged": "^17.0.8",
+    "prettier": "^3.9.1",
     "sass": "~1.32.6",
     "sass-loader": "~8.0.0",
     "vue-eslint-parser": "^10.4.1"

package.json

@@ -1972,6 +1972,13 @@
     "answers": "Answers",
     "no": "No"
   },
+  "focusGroup": {
+    "manager": {
+      "title": "Focus Group",
+      "underConstruction": "The Focus Group module is under active development. Session setup, the live discussion room, and reporting are coming soon.",
+      "description": "For now you can manage cooperators and study settings. Use the navigation menu to invite participants and configure your study."
+    }
+  },
   "studyCreation": {
     "chooseEvaluationCategory": "Choose Evaluation Category",
     "selectEvaluationType": "Select the type of evaluation you want to conduct for your study",
@@ -2031,6 +2038,20 @@
           "description": "Compare two versions to determine which performs better"
         }
       },
+      "inquiry": {
+        "focus_group": {
+          "name": "Focus Group",
+          "description": "Moderated group discussion to gather qualitative insights from participants"
+        },
+        "survey": {
+          "name": "Survey",
+          "description": "Collect structured feedback from participants through questionnaires"
+        },
+        "interview": {
+          "name": "Interview",
+          "description": "One-on-one qualitative conversations to explore participant experiences"
+        }
+      },
       "inspection": {
         "heuristic_evaluation": {
           "name": "Heuristic Evaluation",

src/app/plugins/locales/en.json

@@ -1892,6 +1892,13 @@
     "no": "No",
     "sartAnalytics": "Análisis SART"
   },
+  "focusGroup": {
+    "manager": {
+      "title": "Grupo Focal",
+      "underConstruction": "El módulo de Grupo Focal está en desarrollo activo. La configuración de sesiones, la sala de discusión en vivo y los informes estarán disponibles pronto.",
+      "description": "Por ahora puedes gestionar colaboradores y la configuración del estudio. Usa el menú de navegación para invitar participantes y configurar tu estudio."
+    }
+  },
   "studyCreation": {
     "chooseEvaluationCategory": "Elegir Categoría de Evaluación",
     "selectEvaluationType": "Selecciona el tipo de evaluación que deseas realizar para tu estudio",
@@ -1951,6 +1958,20 @@
           "description": "Compara dos versiones para determinar cuál tiene mejor rendimiento."
         }
       },
+      "inquiry": {
+        "focus_group": {
+          "name": "Grupo Focal",
+          "description": "Discusión grupal moderada para recopilar percepciones cualitativas de los participantes."
+        },
+        "survey": {
+          "name": "Encuesta",
+          "description": "Recopila comentarios estructurados de los participantes mediante cuestionarios."
+        },
+        "interview": {
+          "name": "Entrevista",
+          "description": "Conversaciones cualitativas individuales para explorar las experiencias de los participantes."
+        }
+      },
       "inspection": {
         "heuristic_evaluation": {
           "name": "Evaluación Heurística",

src/app/plugins/locales/es.json

@@ -6,6 +6,7 @@ import CardSorting from '@/ux/CardSorting/router.js'
 import HeuristicRoutes from '@/ux/Heuristic/router.js'
 import accessibilityRoutes from '@/ux/accessibility/router.js'
 import UserTestRoutes from '@/ux/UserTest/router.js'
+import FocusGroupRoutes from '@/ux/FocusGroup/router.js'
 import store from '@/store'
 
 const routes = [
@@ -16,6 +17,7 @@ const routes = [
   ...accessibilityRoutes,
   ...HeuristicRoutes,
   ...UserTestRoutes,
+  ...FocusGroupRoutes,
 ]
 
 const router = createRouter({

src/app/router/index.js

@@ -65,7 +65,12 @@ export default class StudyController extends Controller {
         )
         await Promise.all(promises)
       }
-      await super.update('users', payload.testAdmin.userDocId, payload.auxUser)
+      // Remove only the deleted test from the admin's myTests/myAnswers via a
+      // fresh read, instead of overwriting the whole user doc with a stale copy.
+      await userController.removeTestFromUser(
+        payload.testAdmin.userDocId,
+        payload.id,
+      )
       await super.delete(COLLECTION, payload.id)
     } catch (error) {
       throw error
@@ -95,10 +100,15 @@ export default class StudyController extends Controller {
       updateDate: Date.now(),
     })
 
-    // Update answers inside collaborator
+    // Update answers inside collaborator. Only write the single myAnswers
+    // entry; writing the full document with toFirestore() would overwrite
+    // myTests with the stale in-memory copy of the cooperator.
     const userToUpdate = payload.cooperator
     userToUpdate.myAnswers[`${userAnswer.testDocId}`] = userAnswer.toFirestore()
-    await userController.update(userToUpdate.id, userToUpdate.toFirestore())
+    await userController.update(userToUpdate.id, {
+      [`myAnswers.${userAnswer.testDocId}`]:
+        userToUpdate.myAnswers[`${userAnswer.testDocId}`],
+    })
 
     const testToUpdate = payload.test
     const index = testToUpdate.cooperators.findIndex(

src/controllers/StudyController.js

@@ -139,7 +139,11 @@ export default class UserController extends Controller {
   async addNotification(payload) {
     const userToUpdate = await this.getById(payload.userId)
     userToUpdate.notifications.push(payload.notification.toFirestore())
-    return this.update(payload.userId, userToUpdate.toFirestore())
+    // Only write the notifications field to avoid overwriting other fields
+    // (e.g. myTests) with a stale in-memory copy.
+    return this.update(payload.userId, {
+      notifications: userToUpdate.notifications,
+    })
   }
 
   async markNotificationAsRead(payload) {
@@ -155,11 +159,11 @@ export default class UserController extends Controller {
       userToUpdate.notifications[notificationIndex].read = true
       userToUpdate.notifications[notificationIndex].readAt = Date.now()
 
-      // Save updated user data to Firestore
-      await this.update(
-        userToUpdate.id,
-        userToUpdate.toFirestore(),
-      )
+      // Only write the notifications field. Writing the full document with
+      // toFirestore() would overwrite myTests with the stale in-memory copy.
+      await this.update(userToUpdate.id, {
+        notifications: userToUpdate.notifications,
+      })
       return userToUpdate
     } else {
       // Notification was not found in the array
@@ -181,10 +185,11 @@ export default class UserController extends Controller {
 
     if (!hasUnread) return userToUpdate
 
-    await this.update(
-      userToUpdate.id,
-      userToUpdate.toFirestore(),
-    )
+    // Only write the notifications field. Writing the full document with
+    // toFirestore() would overwrite myTests with the stale in-memory copy.
+    await this.update(userToUpdate.id, {
+      notifications: userToUpdate.notifications,
+    })
     // Return the updated user object (in memory) so the store can commit it immediately
     return userToUpdate
   }
@@ -230,10 +235,10 @@ export default class UserController extends Controller {
       }
       const userData = userDoc.data()
 
-      if (userData.myTests[testIdToRemove]) {
+      if (userData.myTests?.[testIdToRemove]) {
         delete userData.myTests[testIdToRemove]
       }
-      if (userData.myAnswers[testIdToRemove]) {
+      if (userData.myAnswers?.[testIdToRemove]) {
         delete userData.myAnswers[testIdToRemove]
       }
 

src/features/auth/controllers/UserController.js

@@ -113,6 +113,34 @@ const methodsByCategory = {
       comingSoon: true,
     },
   ],
+  inquiry: [
+    {
+      id: METHOD_DEFINITIONS.FOCUS_GROUP.id,
+      nameKey: 'studyCreation.methods.inquiry.focus_group.name',
+      descKey: 'studyCreation.methods.inquiry.focus_group.description',
+      icon: 'mdi-account-group',
+      color: 'secondary',
+      available: true,
+    },
+    {
+      id: METHOD_DEFINITIONS.SURVEY.id,
+      nameKey: 'studyCreation.methods.inquiry.survey.name',
+      descKey: 'studyCreation.methods.inquiry.survey.description',
+      icon: 'mdi-clipboard-text',
+      color: 'primary',
+      available: false,
+      comingSoon: true,
+    },
+    {
+      id: METHOD_DEFINITIONS.INTERVIEW.id,
+      nameKey: 'studyCreation.methods.inquiry.interview.name',
+      descKey: 'studyCreation.methods.inquiry.interview.description',
+      icon: 'mdi-microphone',
+      color: 'info',
+      available: false,
+      comingSoon: true,
+    },
+  ],
   inspection: [
     {
       id: METHOD_DEFINITIONS.HEURISTICS.id,

src/features/ux_creation/ChooseStudyMethods.vue

@@ -422,6 +422,8 @@ const submit = async () => {
     category.value == 'test' ? STUDY_TYPES.USER : STUDY_TYPES.HEURISTIC
   if (method.value === STUDY_TYPES.CARD_SORTING)
     testType = STUDY_TYPES.CARD_SORTING
+  if (method.value === STUDY_TYPES.FOCUS_GROUP)
+    testType = STUDY_TYPES.FOCUS_GROUP
 
   isLoading.value = true
   const user = store.getters.user