diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index ec5fbe65..8ad75e57 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -1,3 +1,4 @@
+// oxlint-disable-next-line import/no-commonjs
 module.exports = {
   root: true,
   env: {
diff --git a/app/assets/geode_objects.js b/app/assets/geode_objects.js
index 60eed2e6..899bf6e9 100644
--- a/app/assets/geode_objects.js
+++ b/app/assets/geode_objects.js
@@ -24,7 +24,7 @@ import TriangulatedSurface2D from "@ogw_front/assets/img/geode_objects/Triangula
 import TriangulatedSurface3D from "@ogw_front/assets/img/geode_objects/TriangulatedSurface3D.svg"
 import VertexSet from "@ogw_front/assets/img/geode_objects/VertexSet.svg"
 
-const geode_objects = {
+export const geode_objects = {
   BRep: {
     tooltip: "BRep",
     image: BRep,
@@ -126,5 +126,3 @@ const geode_objects = {
     image: VertexSet,
   },
 }
-
-export default geode_objects
diff --git a/app/components/Carousel.vue b/app/components/Carousel.vue
index 0e56a247..9c37610d 100644
--- a/app/components/Carousel.vue
+++ b/app/components/Carousel.vue
@@ -1,14 +1,17 @@
 <script setup>
+  // oxlint-disable-next-line import/no-unassigned-import
   import "vue3-carousel/dist/carousel.css"
-  import { Carousel, Slide, Navigation, Pagination } from "vue3-carousel"
+  import { Carousel, Navigation, Pagination, Slide } from "vue3-carousel"
   import { useDisplay } from "vuetify"
 
-  const props = defineProps({
+  const NB_ITEMS_TO_DISPLAY = 3
+
+  const { items } = defineProps({
     items: { type: Array, required: true },
   })
 
   const { name } = useDisplay()
-  const nb_items_to_display = ref(3)
+  const nb_items_to_display = ref(NB_ITEMS_TO_DISPLAY)
   watch(
     name,
     (value) => {
@@ -46,7 +49,7 @@
   <ClientOnly>
     <Carousel :settings="carrousel_settings">
       <Slide
-        v-for="(item, index) in props.items"
+        v-for="(item, index) in items"
         :key="index"
         class="carousel__slide"
       >
diff --git a/app/components/CrsSelector.vue b/app/components/CrsSelector.vue
index 880c72a3..70712996 100644
--- a/app/components/CrsSelector.vue
+++ b/app/components/CrsSelector.vue
@@ -1,21 +1,20 @@
 <script setup>
   import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
-  const schema = schemas.opengeodeweb_back.geographic_coordinate_systems
   import { useGeodeStore } from "@ogw_front/stores/geode"
 
+  const schema = schemas.opengeodeweb_back.geographic_coordinate_systems
+
   const emit = defineEmits([
     "update_values",
     "increment_step",
     "decrement_step",
   ])
 
-  const props = defineProps({
+  const { geode_object_type, key_to_update } = defineProps({
     geode_object_type: { type: String, required: true },
     key_to_update: { type: String, required: true },
   })
 
-  const { geode_object_type, key_to_update } = props
-
   const search = ref("")
   const data_table_loading = ref(false)
   const crs_list = ref([])
@@ -33,8 +32,8 @@
   })
 
   function get_selected_crs(crs_code) {
-    for (let i = 0; i <= crs_list.value.length; i++) {
-      if (crs_list.value[i]["code"] == crs_code) {
+    for (let i = 0; i <= crs_list.value.length; i += 1) {
+      if (crs_list.value[i]["code"] === crs_code) {
         return crs_list.value[i]
       }
     }
diff --git a/app/components/DragAndDrop.vue b/app/components/DragAndDrop.vue
index 723dc232..a37f696e 100644
--- a/app/components/DragAndDrop.vue
+++ b/app/components/DragAndDrop.vue
@@ -1,5 +1,13 @@
 <script setup>
-  const props = defineProps({
+  const {
+    multiple,
+    accept,
+    loading,
+    showExtensions,
+    idleText,
+    dropText,
+    loadingText,
+  } = defineProps({
     multiple: { type: Boolean, default: false },
     accept: { type: String, default: "" },
     loading: { type: Boolean, default: false },
@@ -14,18 +22,20 @@
   const isDragging = ref(false)
   const fileInput = ref(null)
 
-  const triggerFileDialog = () => fileInput.value?.click()
+  function triggerFileDialog() {
+    fileInput.value?.click()
+  }
 
-  function handleDrop(e) {
+  function handleDrop(event) {
     isDragging.value = false
-    const files = Array.from(e.dataTransfer.files)
+    const files = [...event.dataTransfer.files]
     emit("files-selected", files)
   }
 
-  function handleFileSelect(e) {
-    const files = Array.from(e.target.files)
+  function handleFileSelect(event) {
+    const files = [...event.target.files]
     emit("files-selected", files)
-    e.target.value = ""
+    event.target.value = ""
   }
 </script>
 
diff --git a/app/components/ExtensionSelector.vue b/app/components/ExtensionSelector.vue
index d5dd322a..4fdbc3e9 100644
--- a/app/components/ExtensionSelector.vue
+++ b/app/components/ExtensionSelector.vue
@@ -11,11 +11,10 @@
     "decrement_step",
   ])
 
-  const props = defineProps({
+  const { geode_object_type, filenames } = defineProps({
     geode_object_type: { type: String, required: true },
     filenames: { type: Array, required: true },
   })
-  const { geode_object_type, filenames } = props
   const geode_objects_and_output_extensions = ref({})
   const loading = ref(false)
 
@@ -25,27 +24,20 @@
     toggle_loading()
     geode_objects_and_output_extensions.value = {}
     const geodeStore = useGeodeStore()
-    const promise_array = filenames.map((filename) => {
-      return new Promise((resolve, reject) => {
-        const params = {
+    const values = await Promise.all(
+      filenames.map(async (filename) => {
+        const response = await geodeStore.request(schema, {
           geode_object_type,
           filename,
-        }
-        geodeStore.request(schema, params, {
-          request_error_function: () => reject(),
-          response_function: (response) => {
-            resolve(response.geode_objects_and_output_extensions)
-          },
-          response_error_function: () => reject(),
         })
-      })
-    })
-    const values = await Promise.all(promise_array)
+        return response.geode_objects_and_output_extensions
+      }),
+    )
     const all_keys = [...new Set(values.flatMap((value) => Object.keys(value)))]
     const common_keys = all_keys.filter(
       (i) => !values.some((j) => !Object.keys(j).includes(i)),
     )
-    var final_object = {}
+    const final_object = {}
     for (const key of common_keys) {
       final_object[key] = {}
       for (const value of values) {
@@ -61,7 +53,7 @@
   }
 
   function update_values(output_geode_object, output_extension) {
-    if (output_geode_object != "" && output_extension != "") {
+    if (output_geode_object !== "" && output_extension !== "") {
       emit("update_values", {
         output_geode_object,
         output_extension,
diff --git a/app/components/FeedBack/Snackers.vue b/app/components/FeedBack/Snackers.vue
index 4c0bd746..91a17171 100644
--- a/app/components/FeedBack/Snackers.vue
+++ b/app/components/FeedBack/Snackers.vue
@@ -1,11 +1,14 @@
 <script setup>
   import { useFeedbackStore } from "@ogw_front/stores/feedback"
 
+  const MARGIN_BETWEEN_SNACKERS = 60
+  const FIRST_SNACKER_MARGIN = 8
+
   const feedbackStore = useFeedbackStore()
   const show = ref(true)
 
   function calc_margin(index) {
-    return index * 60 + 8 + "px"
+    return `${index * MARGIN_BETWEEN_SNACKERS + FIRST_SNACKER_MARGIN}px`
   }
 </script>
 
diff --git a/app/components/FileSelector.vue b/app/components/FileSelector.vue
index d943357e..ed325c5c 100644
--- a/app/components/FileSelector.vue
+++ b/app/components/FileSelector.vue
@@ -13,31 +13,35 @@
     "decrement_step",
   ])
 
-  const props = defineProps({
+  const { multiple, files, auto_upload } = defineProps({
     multiple: { type: Boolean, required: true },
     files: { type: Array, default: () => [] },
     auto_upload: { type: Boolean, default: true },
   })
 
-  const internal_files = ref(props.files)
-  const auto_upload = ref(props.auto_upload)
+  const internal_files = ref(files)
+  const internal_auto_upload = ref(auto_upload)
   const accept = ref("")
   const loading = ref(false)
 
   watch(
-    () => props.files,
-    (val) => (internal_files.value = val),
+    () => files,
+    (val) => {
+      internal_files.value = val
+    },
   )
 
   watch(
-    () => props.auto_upload,
-    (val) => (auto_upload.value = val),
+    () => auto_upload,
+    (val) => {
+      internal_auto_upload.value = val
+    },
   )
 
   const toggle_loading = useToggle(loading)
 
   function files_uploaded_event(value) {
-    if (value.length) {
+    if (value.length > 0) {
       emit("update_values", { files: value, auto_upload: false })
       emit("increment_step")
     }
@@ -47,7 +51,9 @@
     toggle_loading()
     const geodeStore = useGeodeStore()
     const response = await geodeStore.request(schema, {})
-    accept.value = response.extensions.map((e) => `.${e}`).join(",")
+    accept.value = response.extensions
+      .map((extension) => `.${extension}`)
+      .join(",")
     toggle_loading()
   }
 
@@ -58,7 +64,12 @@
   <FetchingData v-if="loading" />
   <FileUploader
     v-else
-    v-bind="{ multiple, accept, files: internal_files, auto_upload }"
+    v-bind="{
+      multiple,
+      accept,
+      files: internal_files,
+      auto_upload: internal_auto_upload,
+    }"
     @files_uploaded="files_uploaded_event"
   />
 </template>
diff --git a/app/components/FileUploader.vue b/app/components/FileUploader.vue
index a346cb35..86ab445f 100644
--- a/app/components/FileUploader.vue
+++ b/app/components/FileUploader.vue
@@ -1,13 +1,13 @@
 <script setup>
+  import DragAndDrop from "@ogw_front/components/DragAndDrop"
   import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
   import { upload_file } from "@ogw_front/utils/upload_file"
-  import DragAndDrop from "@ogw_front/components/DragAndDrop"
 
   const schema = schemas.opengeodeweb_back.upload_file
 
   const emit = defineEmits(["files_uploaded", "decrement_step", "reset_values"])
 
-  const props = defineProps({
+  const { multiple, accept, files, auto_upload, mini } = defineProps({
     multiple: { type: Boolean, required: true },
     accept: { type: String, required: true },
     files: { type: Array, required: false, default: [] },
@@ -15,14 +15,14 @@
     mini: { type: Boolean, required: false, default: false },
   })
 
-  const internal_files = ref(props.files)
+  const internal_files = ref(files)
   const loading = ref(false)
   const files_uploaded = ref(false)
 
   const toggle_loading = useToggle(loading)
 
   function processSelectedFiles(files) {
-    if (props.multiple) {
+    if (multiple) {
       internal_files.value = [...internal_files.value, ...files]
     } else {
       internal_files.value = [files[0]]
@@ -39,26 +39,9 @@
 
   async function upload_files() {
     toggle_loading()
-    var promise_array = []
-    for (const file of internal_files.value) {
-      const promise = new Promise((resolve, reject) => {
-        upload_file(
-          { route: schema.$id, file },
-          {
-            request_error_function: () => {
-              reject()
-            },
-            response_function: () => {
-              resolve()
-            },
-            response_error_function: () => {
-              reject()
-            },
-          },
-        )
-      })
-      promise_array.push(promise)
-    }
+    const promise_array = internal_files.value.map((file) =>
+      upload_file({ route: schema.$id, file }),
+    )
     await Promise.all(promise_array)
     files_uploaded.value = true
     emit("files_uploaded", internal_files.value)
@@ -66,15 +49,15 @@
     toggle_loading()
   }
 
-  if (props.files.length) {
-    internal_files.value = props.files
-    if (props.auto_upload) {
+  if (files.length > 0) {
+    internal_files.value = files
+    if (auto_upload) {
       upload_files()
     }
   }
 
   watch(
-    () => props.files,
+    () => files,
     (newVal) => {
       internal_files.value = newVal
     },
@@ -83,7 +66,7 @@
 
   watch(internal_files, (value) => {
     files_uploaded.value = false
-    if (props.auto_upload && value.length > 0) {
+    if (auto_upload && value.length > 0) {
       upload_files()
     }
   })
@@ -91,8 +74,8 @@
 
 <template>
   <DragAndDrop
-    :multiple="props.multiple"
-    :accept="props.accept"
+    :multiple="multiple"
+    :accept="accept"
     :loading="loading"
     :show-extensions="false"
     @files-selected="processSelectedFiles"
@@ -124,7 +107,7 @@
     </v-sheet>
   </v-card-text>
 
-  <v-card-actions v-if="!props.auto_upload && internal_files.length">
+  <v-card-actions v-if="!auto_upload && internal_files.length > 0">
     <v-btn
       color="primary"
       variant="elevated"
diff --git a/app/components/HybridRenderingView.vue b/app/components/HybridRenderingView.vue
index 8a2785e8..8e71dae1 100644
--- a/app/components/HybridRenderingView.vue
+++ b/app/components/HybridRenderingView.vue
@@ -4,6 +4,8 @@
   import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
   import { useViewerStore } from "@ogw_front/stores/viewer"
 
+  const DEFAULT_ELEMENT_HEIGHT = 100
+
   const emit = defineEmits(["click"])
 
   const container = useTemplateRef("viewer")
@@ -16,7 +18,7 @@
 
   const debouncedResize = debounce(() => {
     hybridViewerStore.resize(elementWidth.value, elementHeight.value)
-  }, 100)
+  }, DEFAULT_ELEMENT_HEIGHT)
 
   watch([elementWidth, elementHeight, windowWidth, windowHeight], (value) => {
     debouncedResize()
@@ -32,9 +34,9 @@
   })
 
   function debounce(func, wait) {
-    let timeout
+    let timeout = null
     return function executedFunction(...args) {
-      const later = () => {
+      function later() {
         clearTimeout(timeout)
         func(...args)
       }
diff --git a/app/components/Inspector/InspectionButton.vue b/app/components/Inspector/InspectionButton.vue
index ced5c6e6..38fb10aa 100644
--- a/app/components/Inspector/InspectionButton.vue
+++ b/app/components/Inspector/InspectionButton.vue
@@ -8,7 +8,7 @@
     "increment_step",
     "decrement_step",
   ])
-  const props = defineProps({
+  const { geode_object_type, filename } = defineProps({
     geode_object_type: { type: String, required: true },
     filename: { type: String, required: true },
   })
@@ -37,7 +37,7 @@
     <v-btn
       :loading="loading"
       color="primary"
-      @click="get_inspection_results(props.geode_object_type, props.filename)"
+      @click="get_inspection_results(geode_object_type, filename)"
     >
       Inspect
       <template #loader>
diff --git a/app/components/Inspector/ResultPanel.vue b/app/components/Inspector/ResultPanel.vue
index a81b7824..e82ecba2 100644
--- a/app/components/Inspector/ResultPanel.vue
+++ b/app/components/Inspector/ResultPanel.vue
@@ -1,13 +1,13 @@
 <script setup>
   import InspectorResultPanel from "@ogw_front/components/Inspector/ResultPanel"
 
-  const props = defineProps({
+  const { inspection_result } = defineProps({
     inspection_result: { type: Array, required: true },
   })
   const opened_panels = ref([])
 
   onMounted(async () => {
-    opened_panels.value = props.inspection_result
+    opened_panels.value = inspection_result
       .map((result, i) => (result.nb_issues > 0 ? i : -1))
       .filter((index) => index !== -1)
   })
@@ -17,7 +17,7 @@
   <v-container class="pa-2">
     <v-expansion-panels v-model="opened_panels" multiple elevation="5">
       <v-expansion-panel
-        v-for="(result, index) in props.inspection_result"
+        v-for="(result, index) in inspection_result"
         :key="index"
         class="card"
       >
diff --git a/app/components/Launcher.vue b/app/components/Launcher.vue
index 1c545b9c..b85f3f57 100644
--- a/app/components/Launcher.vue
+++ b/app/components/Launcher.vue
@@ -1,7 +1,7 @@
 <script setup>
-  import Status from "@ogw_front/utils/status"
   import Loading from "@ogw_front/components/Loading"
   import Recaptcha from "@ogw_front/components/Recaptcha"
+  import Status from "@ogw_front/utils/status"
   import { useInfraStore } from "@ogw_front/stores/infra"
 
   const infraStore = useInfraStore()
diff --git a/app/components/Loading.vue b/app/components/Loading.vue
index 379e5852..d1511310 100644
--- a/app/components/Loading.vue
+++ b/app/components/Loading.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ying_yang from "@ogw_front/assets/img/energy_sobriety/ying_yang.png"
   import chemin from "@ogw_front/assets/img/energy_sobriety/chemin.png"
-  import vert from "@ogw_front/assets/img/energy_sobriety/vert.png"
-  import lampadaire from "@ogw_front/assets/img/energy_sobriety/lampadaire.png"
   import collegue from "@ogw_front/assets/img/energy_sobriety/collegue.png"
-  import sobene from "@ogw_front/assets/img/energy_sobriety/sobene.png"
+  import derniere from "@ogw_front/assets/img/energy_sobriety/derniere.png"
   import etincelle from "@ogw_front/assets/img/energy_sobriety/etincelle.png"
   import geste from "@ogw_front/assets/img/energy_sobriety/geste.png"
-  import socle from "@ogw_front/assets/img/energy_sobriety/socle.png"
-  import derniere from "@ogw_front/assets/img/energy_sobriety/derniere.png"
+  import lampadaire from "@ogw_front/assets/img/energy_sobriety/lampadaire.png"
   import salon from "@ogw_front/assets/img/energy_sobriety/salon.png"
+  import sobene from "@ogw_front/assets/img/energy_sobriety/sobene.png"
+  import socle from "@ogw_front/assets/img/energy_sobriety/socle.png"
+  import vert from "@ogw_front/assets/img/energy_sobriety/vert.png"
+  import ying_yang from "@ogw_front/assets/img/energy_sobriety/ying_yang.png"
 
   import Carousel from "@ogw_front/components/Carousel"
 
diff --git a/app/components/MissingFilesSelector.vue b/app/components/MissingFilesSelector.vue
index 6b9de309..d6cd548d 100644
--- a/app/components/MissingFilesSelector.vue
+++ b/app/components/MissingFilesSelector.vue
@@ -13,14 +13,12 @@
     "decrement_step",
   ])
 
-  const props = defineProps({
+  const { multiple, geode_object_type, filenames } = defineProps({
     multiple: { type: Boolean, required: true },
     geode_object_type: { type: String, required: true },
     filenames: { type: Array, required: true },
   })
 
-  const { multiple, geode_object_type, filenames } = props
-
   const accept = ref("")
   const loading = ref(false)
   const has_missing_files = ref(false)
@@ -40,37 +38,33 @@
     additional_files.value = []
     const geodeStore = useGeodeStore()
 
-    const promise_array = filenames.map((filename) => {
-      const params = { geode_object_type, filename }
-      return new Promise((resolve, reject) => {
-        geodeStore.request(schema, params, {
-          request_error_function: () => reject(),
-          response_function: (response) => resolve(response),
-          response_error_function: () => reject(),
-        })
+    const promise_array = filenames.map(async (filename) => {
+      const response = await geodeStore.request(schema, {
+        geode_object_type,
+        filename,
       })
+      return response
     })
     const values = await Promise.all(promise_array)
     for (const value of values) {
-      has_missing_files.value = value.has_missing_files
-        ? true
-        : has_missing_files.value
-      mandatory_files.value = [].concat(
-        mandatory_files.value,
-        value.mandatory_files,
-      )
-      additional_files.value = [].concat(
-        additional_files.value,
-        value.additional_files,
-      )
+      if (value.has_missing_files) {
+        has_missing_files.value = true
+      }
+      mandatory_files.value = [
+        ...mandatory_files.value,
+        ...value.mandatory_files,
+      ]
+      additional_files.value = [
+        ...additional_files.value,
+        ...value.additional_files,
+      ]
     }
-    if (!has_missing_files.value) {
-      emit("increment_step")
-    } else {
-      accept.value = []
-        .concat(mandatory_files.value, additional_files.value)
-        .map((filename) => "." + filename.split(".").pop())
+    if (has_missing_files.value) {
+      accept.value = [...mandatory_files.value, ...additional_files.value]
+        .map((filename) => `.${filename.split(".").pop()}`)
         .join(",")
+    } else {
+      emit("increment_step")
     }
     toggle_loading()
   }
@@ -113,7 +107,7 @@
     </v-row>
     <v-row>
       <v-col
-        v-if="!mandatory_files.length && additional_files.length"
+        v-if="mandatory_files.length === 0 && additional_files.length > 0"
         cols="auto"
       >
         <v-btn @click="emit('increment_step')" color="warning">Skip step</v-btn>
diff --git a/app/components/ObjectSelector.vue b/app/components/ObjectSelector.vue
index 5457c1be..09e1133e 100644
--- a/app/components/ObjectSelector.vue
+++ b/app/components/ObjectSelector.vue
@@ -1,20 +1,19 @@
 <script setup>
-  import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
-
-  import geode_objects from "@ogw_front/assets/geode_objects"
   import FetchingData from "@ogw_front/components/FetchingData.vue"
+  import { geode_objects } from "@ogw_front/assets/geode_objects"
+  import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
   import { useGeodeStore } from "@ogw_front/stores/geode"
 
   const schema = schemas.opengeodeweb_back.allowed_objects
 
   const emit = defineEmits(["update_values", "increment_step"])
   console.log("ObjectSelector")
-  const props = defineProps({
+
+  const { filenames } = defineProps({
     filenames: { type: Array, required: true },
   })
 
   const geodeStore = useGeodeStore()
-  const { filenames } = props
 
   const loading = ref(false)
   const allowed_objects = ref({})
@@ -61,11 +60,13 @@
     toggle_loading()
     allowed_objects.value = {}
 
-    const promise_array = filenames.map((filename) => {
-      return geodeStore.request(schema, { filename })
-    })
+    const promise_array = filenames.map((filename) =>
+      geodeStore.request(schema, { filename }),
+    )
     const responses = await Promise.all(promise_array)
-    const allowed_objects_list = responses.map((r) => r.allowed_objects)
+    const allowed_objects_list = responses.map(
+      (response) => response.allowed_objects,
+    )
     const all_keys = [...new Set(allowed_objects_list.flatMap(Object.keys))]
     const common_keys = all_keys.filter((key) =>
       allowed_objects_list.every((obj) => key in obj),
@@ -77,7 +78,7 @@
       )
       const priorities = allowed_objects_list
         .map((obj) => obj[key].object_priority)
-        .filter((p) => p !== undefined && p !== null)
+        .filter((priority) => priority !== undefined && priority !== null)
       final_object[key] = { is_loadable: Math.min(...load_scores) }
       if (priorities.length) {
         final_object[key].object_priority = Math.max(...priorities)
diff --git a/app/components/OptionCard.vue b/app/components/OptionCard.vue
index 9e488311..25ff03c5 100644
--- a/app/components/OptionCard.vue
+++ b/app/components/OptionCard.vue
@@ -4,7 +4,7 @@
   const theme = useTheme()
   const primaryColor = computed(() => theme.current.value.colors.primary)
 
-  defineProps({
+  const { title, width, maxHeight } = defineProps({
     title: { type: String, default: "" },
     width: { type: [Number, String], default: 320 },
     maxHeight: { type: [Number, String], default: 500 },
diff --git a/app/components/PackagesVersions.vue b/app/components/PackagesVersions.vue
index 61b5e5ca..6b12435b 100644
--- a/app/components/PackagesVersions.vue
+++ b/app/components/PackagesVersions.vue
@@ -2,7 +2,7 @@
   import Status from "@ogw_front/utils/status"
   import { useGeodeStore } from "@ogw_front/stores/geode"
 
-  const props = defineProps({
+  const { schema } = defineProps({
     schema: { type: Object, required: true },
   })
 
@@ -11,7 +11,7 @@
 
   async function get_packages_versions() {
     await geodeStore.request(
-      props.schema,
+      schema,
       {},
       {
         response_function: (response) => {
@@ -24,7 +24,7 @@
   watch(
     () => geodeStore.status,
     (value) => {
-      if (value == Status.CONNECTED) get_packages_versions()
+      if (value === Status.CONNECTED) get_packages_versions()
     },
   )
 
diff --git a/app/components/Recaptcha.vue b/app/components/Recaptcha.vue
index 6e57d3c2..cc5501d2 100644
--- a/app/components/Recaptcha.vue
+++ b/app/components/Recaptcha.vue
@@ -2,7 +2,9 @@
   import { appMode } from "@ogw_front/utils/app_mode"
   import { useInfraStore } from "@ogw_front/stores/infra"
 
-  const props = defineProps({
+  const RESPONSE_STATUS_OK = 200
+
+  const { button_label, button_color, color } = defineProps({
     button_label: {
       type: String,
       required: false,
@@ -58,7 +60,7 @@
       },
     })
     infraStore.$patch({
-      is_captcha_validated: response.status === 200,
+      is_captcha_validated: response.status === RESPONSE_STATUS_OK,
     })
   }
 </script>
@@ -95,8 +97,8 @@
   <VRow align="center" justify="center">
     <VCol cols="4" class="d-flex justify-center align-center">
       <VBtn
-        :text="props.button_label"
-        :color="props.color || props.button_color"
+        :text="button_label"
+        :color="color || button_color"
         @click="submit_recaptcha"
       />
     </VCol>
diff --git a/app/components/RemoteRenderingView.vue b/app/components/RemoteRenderingView.vue
index 54d1801a..2f08d6dd 100644
--- a/app/components/RemoteRenderingView.vue
+++ b/app/components/RemoteRenderingView.vue
@@ -1,12 +1,12 @@
 <script setup>
-  import vtkRemoteView from "@kitware/vtk.js/Rendering/Misc/RemoteView"
   import { useElementSize, useWindowSize } from "@vueuse/core"
-  import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
   import Status from "@ogw_front/utils/status"
   import ViewToolbar from "@ogw_front/components/ViewToolbar"
   import { useViewerStore } from "@ogw_front/stores/viewer"
+  import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
+  import vtkRemoteView from "@kitware/vtk.js/Rendering/Misc/RemoteView"
 
-  const props = defineProps({
+  const { viewId } = defineProps({
     viewId: { type: String, default: "-1" },
   })
 
@@ -28,6 +28,7 @@
   }
 
   const connected = ref(false)
+  // oxlint-disable-next-line import/no-named-as-default-member
   const view = vtkRemoteView.newInstance({
     rpcWheelEvent: "viewport.mouse.zoom.wheel",
   })
diff --git a/app/components/Screenshot.vue b/app/components/Screenshot.vue
index 8fb71a8a..6aabc3d7 100644
--- a/app/components/Screenshot.vue
+++ b/app/components/Screenshot.vue
@@ -6,7 +6,7 @@
 
   const emit = defineEmits(["close"])
 
-  const props = defineProps({
+  const { show_dialog, width } = defineProps({
     show_dialog: { type: Boolean, required: true },
     width: { type: Number, required: false, default: 400 },
   })
@@ -31,7 +31,7 @@
         response_function: async (response) => {
           fileDownload(
             response.blob,
-            filename.value + "." + output_extension.value,
+            `${filename.value}.${output_extension.value}`,
           )
         },
       },
@@ -47,9 +47,9 @@
 </script>
 <template>
   <OptionCard
-    v-if="props.show_dialog"
+    v-if="show_dialog"
     title="Take a screenshot"
-    :width="props.width"
+    :width="width"
     class="position-absolute"
     style="z-index: 2; top: 90px; right: 55px"
   >
diff --git a/app/components/Step.vue b/app/components/Step.vue
index e71ebccc..3701f868 100644
--- a/app/components/Step.vue
+++ b/app/components/Step.vue
@@ -1,12 +1,12 @@
 <script setup>
   function truncate(text, maxLength) {
     if (text.length > maxLength) {
-      return text.slice(0, maxLength) + "..."
+      return `${text.slice(0, maxLength)}...`
     }
     return text
   }
 
-  const props = defineProps({
+  const { step_index } = defineProps({
     step_index: { type: Number, required: true },
   })
 
@@ -26,17 +26,17 @@
   }
 
   function increment_step() {
-    stepper_tree.current_step_index++
+    stepper_tree.current_step_index += 1
   }
 
   function decrement_step() {
-    stepper_tree.current_step_index--
+    stepper_tree.current_step_index -= 1
   }
 
   const sortedChips = computed(() => {
-    const chips = steps.value[props.step_index]?.chips || []
-    return [...chips].sort((a, b) =>
-      a.localeCompare(b, undefined, {
+    const chips = steps.value[step_index]?.chips || []
+    return chips.toSorted((chipA, chipB) =>
+      chipA.localeCompare(chipB, undefined, {
         numeric: true,
         sensitivity: "base",
       }),
diff --git a/app/components/VeaseViewToolbar.vue b/app/components/VeaseViewToolbar.vue
index 7a7c644f..8f3d08ca 100644
--- a/app/components/VeaseViewToolbar.vue
+++ b/app/components/VeaseViewToolbar.vue
@@ -4,8 +4,8 @@
   import Screenshot from "@ogw_front/components/Screenshot"
   import ZScaling from "@ogw_front/components/ZScaling"
 
-  import { useViewerStore } from "@ogw_front/stores/viewer"
   import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+  import { useViewerStore } from "@ogw_front/stores/viewer"
 
   const hybridViewerStore = useHybridViewerStore()
   const viewerStore = useViewerStore()
@@ -21,7 +21,7 @@
     },
   )
 
-  const handleZScalingClose = async () => {
+  async function handleZScalingClose() {
     await hybridViewerStore.setZScaling(zScale.value)
     showZScaling.value = false
   }
diff --git a/app/components/Viewer/BreadCrumb.vue b/app/components/Viewer/BreadCrumb.vue
index ea5ad6e0..5f2ff37e 100644
--- a/app/components/Viewer/BreadCrumb.vue
+++ b/app/components/Viewer/BreadCrumb.vue
@@ -7,15 +7,13 @@
 
   const selectedTree = computed(() => treeviewStore.selectedTree)
 
-  const goBackToFileTree = () => {
+  function goBackToFileTree() {
     treeviewStore.displayFileTree()
   }
 
   const model_id = computed(() => treeviewStore.model_id)
 
-  const metaDatas = computed(() => {
-    return dataStore.getItem(model_id.value).value
-  })
+  const metaDatas = computed(() => dataStore.getItem(model_id.value).value)
 </script>
 
 <template>
diff --git a/app/components/Viewer/ContextMenu.vue b/app/components/Viewer/ContextMenu.vue
index 28a33045..54d6bf25 100644
--- a/app/components/Viewer/ContextMenu.vue
+++ b/app/components/Viewer/ContextMenu.vue
@@ -1,12 +1,24 @@
 <script setup>
-  import { useMenuStore } from "@ogw_front/stores/menu"
   import { useDataStore } from "@ogw_front/stores/data"
   import { useEventListener } from "@vueuse/core"
+  import { useMenuStore } from "@ogw_front/stores/menu"
+
+  const RADIUS = 80
+  const MARGIN_OFFSET = 40
+  const Z_INDEX_MENU = 1000
+  const Z_INDEX_ACTIVE_ITEM = 10
+  const Z_INDEX_BASE_ITEM = 1
+  const FULL_ANGLE = 360
+  const ANGLE_45 = 45
+  const ANGLE_135 = 135
+  const ANGLE_225 = 225
+  const ANGLE_315 = 315
+  const CLOSE_DELAY = 100
 
   const menuStore = useMenuStore()
   const dataStore = useDataStore()
 
-  const props = defineProps({
+  const { id, x, y, containerWidth, containerHeight } = defineProps({
     id: { type: String, required: true },
     x: { type: Number, required: true },
     y: { type: Number, required: true },
@@ -15,21 +27,20 @@
   })
 
   const meta_data = computed(() => {
-    const itemId = props.id || menuStore.current_id
+    const itemId = id || menuStore.current_id
     if (!itemId) return {}
     return dataStore.getItem(itemId).value || {}
   })
 
-  const radius = 80
   const show_menu = ref(true)
   const isDragging = ref(false)
   const dragStartX = ref(0)
   const dragStartY = ref(0)
-  const menuX = ref(props.x)
-  const menuY = ref(props.y)
+  const menuX = ref(x)
+  const menuY = ref(y)
 
   watch(
-    () => [props.x, props.y],
+    () => [x, y],
     ([newX, newY]) => {
       const { x, y } = clampPosition(newX, newY)
       menuX.value = x
@@ -42,92 +53,95 @@
   useEventListener(
     window,
     "mousemove",
-    (e) => {
+    (event) => {
       if (!isDragging.value) return
-      handleDrag(e)
+      handleDrag(event)
     },
     { passive: true },
   )
 
-  useEventListener(window, "mouseup", (e) => {
+  useEventListener(window, "mouseup", (event) => {
     if (!isDragging.value) return
-    stopDrag(e)
+    stopDrag(event)
   })
 
   const menu_items = shallowRef([])
   watch(
     () => [meta_data.value.viewer_type, meta_data.value.geode_object_type],
-    ([v, g]) => {
-      menu_items.value = menuStore.getMenuItems(v, g)
+    ([viewer_type, geode_object_type]) => {
+      menu_items.value = menuStore.getMenuItems(viewer_type, geode_object_type)
     },
     { immediate: true },
   )
 
   const menuItemCount = computed(() => menu_items.value.length)
 
-  function startDrag(e) {
+  function startDrag(event) {
     isDragging.value = true
-    dragStartX.value = e.clientX - menuX.value
-    dragStartY.value = e.clientY - menuY.value
-    e.preventDefault()
+    dragStartX.value = event.clientX - menuX.value
+    dragStartY.value = event.clientY - menuY.value
+    event.preventDefault()
   }
 
   function clampPosition(x, y) {
-    const margin = radius + 40
+    const margin = RADIUS + MARGIN_OFFSET
     return {
-      x: Math.min(Math.max(x, margin), props.containerWidth - margin),
-      y: Math.min(Math.max(y, margin), props.containerHeight - margin),
+      x: Math.min(Math.max(x, margin), containerWidth - margin),
+      y: Math.min(Math.max(y, margin), containerHeight - margin),
     }
   }
 
-  function handleDrag(e) {
+  function handleDrag(event) {
     const { x, y } = clampPosition(
-      e.clientX - dragStartX.value,
-      e.clientY - dragStartY.value,
+      event.clientX - dragStartX.value,
+      event.clientY - dragStartY.value,
     )
     menuX.value = x
     menuY.value = y
     menuStore.setMenuPosition(x, y)
   }
 
-  function stopDrag(e) {
+  function stopDrag(event) {
     isDragging.value = false
-    e.stopPropagation()
+    event.stopPropagation()
     menuStore.setMenuPosition(menuX.value, menuY.value)
   }
 
   function getMenuStyle() {
     return {
       position: "fixed",
-      left: `${menuStore.containerLeft + menuX.value - radius}px`,
-      top: `${menuStore.containerTop + menuY.value - radius}px`,
-      zIndex: 1000,
+      left: `${menuStore.containerLeft + menuX.value - RADIUS}px`,
+      top: `${menuStore.containerTop + menuY.value - RADIUS}px`,
+      zIndex: Z_INDEX_MENU,
     }
   }
 
   function getTooltipLocation(index) {
-    const angle = (index / menuItemCount.value) * 360
-    if (angle < 45 || angle >= 315) return "right"
-    if (angle >= 45 && angle < 135) return "top"
-    if (angle >= 135 && angle < 225) return "left"
+    const angle = (index / menuItemCount.value) * FULL_ANGLE
+    if (angle < ANGLE_45 || angle >= ANGLE_315) return "right"
+    if (angle >= ANGLE_45 && angle < ANGLE_135) return "top"
+    if (angle >= ANGLE_135 && angle < ANGLE_225) return "left"
     return "bottom"
   }
 
   function getTooltipOrigin(index) {
-    const angle = (index / menuItemCount.value) * 360
-    if (angle < 45 || angle >= 315) return "left"
-    if (angle >= 45 && angle < 135) return "bottom"
-    if (angle >= 135 && angle < 225) return "right"
+    const angle = (index / menuItemCount.value) * FULL_ANGLE
+    if (angle < ANGLE_45 || angle >= ANGLE_315) return "left"
+    if (angle >= ANGLE_45 && angle < ANGLE_135) return "bottom"
+    if (angle >= ANGLE_135 && angle < ANGLE_225) return "right"
     return "top"
   }
 
   function getItemStyle(index) {
     const angle = (index / menuItemCount.value) * 2 * Math.PI
     return {
-      transform: `translate(${Math.cos(angle) * radius}px, ${Math.sin(angle) * radius}px)`,
+      transform: `translate(${Math.cos(angle) * RADIUS}px, ${Math.sin(angle) * RADIUS}px)`,
       transition: "opacity 0.2s ease, transform 0.2s ease",
       position: "absolute",
-      zIndex: menuStore.active_item_index === index ? 10 : 1,
+      zIndex:
+        menuStore.active_item_index === index
+          ? Z_INDEX_ACTIVE_ITEM
+          : Z_INDEX_BASE_ITEM,
     }
   }
 </script>
@@ -138,13 +152,13 @@
     content-class="circular-menu-container"
     :style="getMenuStyle()"
     :close-on-content-click="false"
-    :close-delay="100"
+    :close-delay="CLOSE_DELAY"
     :overlay="false"
   >
     <div class="circular-menu-drag-handle" @mousedown.stop="startDrag">
       <div
         class="circular-menu-items"
-        :style="{ width: `${radius * 2}px`, height: `${radius * 2}px` }"
+        :style="{ width: `${RADIUS * 2}px`, height: `${RADIUS * 2}px` }"
       >
         <component
           v-for="(item, index) in menu_items"
@@ -152,7 +166,7 @@
           :key="index"
           :index="index"
           :itemProps="{
-            id: props.id,
+            id: id,
             tooltip_location: getTooltipLocation(index),
             tooltip_origin: getTooltipOrigin(index),
             totalItems: menuItemCount,
diff --git a/app/components/Viewer/ContextMenuItem.vue b/app/components/Viewer/ContextMenuItem.vue
index 3e81f217..487551a5 100644
--- a/app/components/Viewer/ContextMenuItem.vue
+++ b/app/components/Viewer/ContextMenuItem.vue
@@ -1,66 +1,76 @@
 <script setup>
-  import { useTheme } from "vuetify"
-  import { useMenuStore } from "@ogw_front/stores/menu"
   import { useElementSize } from "@vueuse/core"
+  import { useMenuStore } from "@ogw_front/stores/menu"
+  import { useTheme } from "vuetify"
+
+  const CARD_WIDTH = 320
+  const CARD_HEIGHT = 500
+  const MARGIN = 60
+  const RADIUS = 80
+  const OFFSET = 40
 
   const menuStore = useMenuStore()
   const theme = useTheme()
   const primaryColor = computed(() => theme.current.value.colors.primary)
-  const props = defineProps({
+  const { index, itemProps, tooltip, btn_image } = defineProps({
     index: { type: Number, required: true },
     itemProps: { type: Object, required: true },
     tooltip: { type: String, required: true },
     btn_image: { type: String, required: true },
   })
 
-  const is_active = computed(() => menuStore.active_item_index === props.index)
+  const is_active = computed(() => menuStore.active_item_index === index)
   const optionsRef = ref(null)
   const { height: optionsHeight } = useElementSize(optionsRef)
 
   const maxCardHeight = computed(() =>
-    Math.min(500, menuStore.containerHeight - 40),
+    Math.min(CARD_HEIGHT, menuStore.containerHeight - OFFSET),
   )
 
   const optionsStyle = computed(() => {
     if (!is_active.value || !optionsHeight.value) return {}
-    const angle = (props.index / props.itemProps.totalItems) * 2 * Math.PI
-    const radius = 80
+    const angle = (index / itemProps.totalItems) * 2 * Math.PI
+    const radius = RADIUS
     const absoluteButtonY = menuStore.menuY + Math.sin(angle) * radius
-    const h = optionsHeight.value
-    const margin = 20
+    const height = optionsHeight.value
+    const margin = MARGIN
     let dy = 0
 
-    if (absoluteButtonY - h / 2 < margin) {
-      dy = margin - (absoluteButtonY - h / 2)
-    } else if (absoluteButtonY + h / 2 > menuStore.containerHeight - margin) {
-      dy = menuStore.containerHeight - margin - (absoluteButtonY + h / 2)
+    if (absoluteButtonY - height / 2 < margin) {
+      dy = margin - (absoluteButtonY - height / 2)
+    } else if (
+      absoluteButtonY + height / 2 >
+      menuStore.containerHeight - margin
+    ) {
+      dy = menuStore.containerHeight - margin - (absoluteButtonY + height / 2)
     }
     return { top: `calc(50% + ${dy}px)` }
   })
 
   const optionsClass = computed(() => {
-    const loc = props.itemProps.tooltip_location
-    const cardWidth = 320
-    const margin = 60
-    const radius = 80
+    const loc = itemProps.tooltip_location
+    const margin = MARGIN
+    const radius = RADIUS
     if (loc === "right") {
-      return menuStore.menuX + radius + margin + cardWidth >
+      return menuStore.menuX + radius + margin + CARD_WIDTH >
         menuStore.containerWidth
         ? "options-left"
         : "options-right"
     }
-    return menuStore.menuX - radius - margin - cardWidth < 0
+    return menuStore.menuX - radius - margin - CARD_WIDTH < 0
       ? "options-right"
       : "options-left"
   })
 
-  const toggleOptions = () => menuStore.toggleItemOptions(props.index)
+  function toggleOptions() {
+    menuStore.toggleItemOptions(index)
+  }
 </script>
 <template>
   <v-sheet class="menu-item-container transition-swing" color="transparent">
     <v-tooltip
-      :location="props.itemProps.tooltip_location"
-      :origin="props.itemProps.tooltip_origin"
+      :location="itemProps.tooltip_location"
+      :origin="itemProps.tooltip_origin"
     >
       <template v-slot:activator="{ props: tooltipProps }">
         <v-btn
@@ -74,7 +84,7 @@
           <v-img :src="btn_image" height="28" width="28" />
         </v-btn>
       </template>
-      <span>{{ props.tooltip }}</span>
+      <span>{{ tooltip }}</span>
     </v-tooltip>
 
     <v-sheet
@@ -86,11 +96,7 @@
       color="transparent"
       @click.stop
     >
-      <OptionCard
-        :title="props.tooltip"
-        width="320"
-        :max-height="maxCardHeight"
-      >
+      <OptionCard :title="tooltip" width="320" :max-height="maxCardHeight">
         <slot name="options" />
       </OptionCard>
     </v-sheet>
diff --git a/app/components/Viewer/EdgedCurve/PointsOptions.vue b/app/components/Viewer/EdgedCurve/PointsOptions.vue
index 6566cd0a..a6e412f4 100644
--- a/app/components/Viewer/EdgedCurve/PointsOptions.vue
+++ b/app/components/Viewer/EdgedCurve/PointsOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
   import EdgedCurvePoints from "@ogw_front/assets/viewer_svgs/edged_curve_points.svg"
+  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshPointsOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="EdgedCurvePoints"
   />
 </template>
diff --git a/app/components/Viewer/EdgedCurve/SpecificEdgesOptions.vue b/app/components/Viewer/EdgedCurve/SpecificEdgesOptions.vue
index c82938b1..0effe77a 100644
--- a/app/components/Viewer/EdgedCurve/SpecificEdgesOptions.vue
+++ b/app/components/Viewer/EdgedCurve/SpecificEdgesOptions.vue
@@ -1,8 +1,8 @@
 <script setup>
+  import EdgedCurveEdges from "@ogw_front/assets/viewer_svgs/edged_curve_edges.svg"
   import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
   import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector"
-  import EdgedCurveEdges from "@ogw_front/assets/viewer_svgs/edged_curve_edges.svg"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
 
   import { useDataStyleStore } from "@ogw_front/stores/data_style"
   import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
@@ -10,11 +10,11 @@
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 
-  const id = toRef(() => props.itemProps.id)
+  const id = toRef(() => itemProps.id)
 
   const visibility = computed({
     get: () => dataStyleStore.meshEdgesVisibility(id.value),
@@ -62,7 +62,7 @@
 
 <template>
   <ViewerContextMenuItem
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     tooltip="Edges options"
     :btn_image="EdgedCurveEdges"
   >
diff --git a/app/components/Viewer/Generic/Mesh/CellsOptions.vue b/app/components/Viewer/Generic/Mesh/CellsOptions.vue
index 0644b0d1..14dc1706 100644
--- a/app/components/Viewer/Generic/Mesh/CellsOptions.vue
+++ b/app/components/Viewer/Generic/Mesh/CellsOptions.vue
@@ -1,7 +1,7 @@
 <script setup>
   import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
   import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
 
   import { useDataStyleStore } from "@ogw_front/stores/data_style"
   import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
@@ -9,13 +9,13 @@
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
 
-  const props = defineProps({
+  const { itemProps, btn_image, tooltip } = defineProps({
     itemProps: { type: Object, required: true },
     btn_image: { type: String, required: true },
     tooltip: { type: String, required: false, default: "Cells options" },
   })
 
-  const id = toRef(() => props.itemProps.id)
+  const id = toRef(() => itemProps.id)
 
   const visibility = computed({
     get: () => dataStyleStore.meshCellsVisibility(id.value),
@@ -63,9 +63,9 @@
 
 <template>
   <ViewerContextMenuItem
-    :itemProps="props.itemProps"
-    :tooltip="props.tooltip"
-    :btn_image="props.btn_image"
+    :itemProps="itemProps"
+    :tooltip="tooltip"
+    :btn_image="btn_image"
   >
     <template #options>
       <ViewerOptionsVisibilitySwitch v-model="visibility" />
diff --git a/app/components/Viewer/Generic/Mesh/EdgesOptions.vue b/app/components/Viewer/Generic/Mesh/EdgesOptions.vue
index 02fe857e..ee01c9db 100644
--- a/app/components/Viewer/Generic/Mesh/EdgesOptions.vue
+++ b/app/components/Viewer/Generic/Mesh/EdgesOptions.vue
@@ -1,7 +1,7 @@
 <script setup>
   import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
   import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
 
   import { useDataStyleStore } from "@ogw_front/stores/data_style"
   import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
@@ -9,12 +9,12 @@
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
 
-  const props = defineProps({
+  const { itemProps, btn_image } = defineProps({
     itemProps: { type: Object, required: true },
     btn_image: { type: String, required: true },
   })
 
-  const id = toRef(() => props.itemProps.id)
+  const id = toRef(() => itemProps.id)
 
   const visibility = computed({
     get: () => dataStyleStore.meshEdgesVisibility(id.value),
@@ -55,9 +55,9 @@
 
 <template>
   <ViewerContextMenuItem
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     tooltip="Edges options"
-    :btn_image="props.btn_image"
+    :btn_image="btn_image"
   >
     <template #options>
       <ViewerOptionsVisibilitySwitch v-model="visibility" />
diff --git a/app/components/Viewer/Generic/Mesh/PointsOptions.vue b/app/components/Viewer/Generic/Mesh/PointsOptions.vue
index 7f7c2810..af526a92 100644
--- a/app/components/Viewer/Generic/Mesh/PointsOptions.vue
+++ b/app/components/Viewer/Generic/Mesh/PointsOptions.vue
@@ -1,7 +1,7 @@
 <script setup>
   import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
   import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
 
   import { useDataStyleStore } from "@ogw_front/stores/data_style"
   import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
@@ -9,12 +9,12 @@
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
 
-  const props = defineProps({
+  const { itemProps, btn_image } = defineProps({
     itemProps: { type: Object, required: true },
     btn_image: { type: String, required: true },
   })
 
-  const id = toRef(() => props.itemProps.id)
+  const id = toRef(() => itemProps.id)
 
   const visibility = computed({
     get: () => dataStyleStore.meshPointsVisibility(id.value),
@@ -48,9 +48,9 @@
 
 <template>
   <ViewerContextMenuItem
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     tooltip="Points options"
-    :btn_image="props.btn_image"
+    :btn_image="btn_image"
   >
     <template #options>
       <ViewerOptionsVisibilitySwitch v-model="visibility" />
diff --git a/app/components/Viewer/Generic/Mesh/PolygonsOptions.vue b/app/components/Viewer/Generic/Mesh/PolygonsOptions.vue
index 7eb90309..b4d2c08b 100644
--- a/app/components/Viewer/Generic/Mesh/PolygonsOptions.vue
+++ b/app/components/Viewer/Generic/Mesh/PolygonsOptions.vue
@@ -1,7 +1,7 @@
 <script setup>
   import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
   import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
 
   import { useDataStyleStore } from "@ogw_front/stores/data_style"
   import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
@@ -9,14 +9,13 @@
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
 
-  const props = defineProps({
+  const { itemProps, btn_image, tooltip } = defineProps({
     itemProps: { type: Object, required: true },
     btn_image: { type: String, required: true },
-
     tooltip: { type: String, required: false, default: "Polygons options" },
   })
 
-  const id = toRef(() => props.itemProps.id)
+  const id = toRef(() => itemProps.id)
 
   const visibility = computed({
     get: () => dataStyleStore.meshPolygonsVisibility(id.value),
@@ -50,9 +49,9 @@
 
 <template>
   <ViewerContextMenuItem
-    :itemProps="props.itemProps"
-    :tooltip="props.tooltip"
-    :btn_image="props.btn_image"
+    :itemProps="itemProps"
+    :tooltip="tooltip"
+    :btn_image="btn_image"
   >
     <template #options>
       <ViewerOptionsVisibilitySwitch v-model="visibility" />
diff --git a/app/components/Viewer/Generic/Mesh/PolyhedraOptions.vue b/app/components/Viewer/Generic/Mesh/PolyhedraOptions.vue
index 5e570ff5..7f35a70d 100644
--- a/app/components/Viewer/Generic/Mesh/PolyhedraOptions.vue
+++ b/app/components/Viewer/Generic/Mesh/PolyhedraOptions.vue
@@ -1,7 +1,7 @@
 <script setup>
   import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
   import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
 
   import { useDataStyleStore } from "@ogw_front/stores/data_style"
   import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
@@ -9,13 +9,13 @@
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
 
-  const props = defineProps({
+  const { itemProps, btn_image, tooltip } = defineProps({
     itemProps: { type: Object, required: true },
     btn_image: { type: String, required: true },
     tooltip: { type: String, required: false, default: "Polyhedra options" },
   })
 
-  const id = toRef(() => props.itemProps.id)
+  const id = toRef(() => itemProps.id)
 
   const visibility = computed({
     get: () => dataStyleStore.meshPolyhedraVisibility(id.value),
@@ -42,9 +42,9 @@
 
 <template>
   <ViewerContextMenuItem
-    :itemProps="props.itemProps"
-    :tooltip="props.tooltip"
-    :btn_image="props.btn_image"
+    :itemProps="itemProps"
+    :tooltip="tooltip"
+    :btn_image="btn_image"
   >
     <template #options>
       <ViewerOptionsVisibilitySwitch v-model="visibility" />
diff --git a/app/components/Viewer/Generic/Model/EdgesOptions.vue b/app/components/Viewer/Generic/Model/EdgesOptions.vue
index 5e1034f0..69916499 100644
--- a/app/components/Viewer/Generic/Model/EdgesOptions.vue
+++ b/app/components/Viewer/Generic/Model/EdgesOptions.vue
@@ -1,7 +1,7 @@
 <script setup>
+  import SurfaceEdges from "@ogw_front/assets/viewer_svgs/surface_edges.svg"
   import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
   import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
-  import SurfaceEdges from "@ogw_front/assets/viewer_svgs/surface_edges.svg"
 
   import { useDataStyleStore } from "@ogw_front/stores/data_style"
   import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
@@ -9,11 +9,11 @@
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 
-  const id = toRef(() => props.itemProps.id)
+  const id = toRef(() => itemProps.id)
 
   const visibility = computed({
     get: () => dataStyleStore.modelEdgesVisibility(id.value),
diff --git a/app/components/Viewer/Generic/Model/PointsOptions.vue b/app/components/Viewer/Generic/Model/PointsOptions.vue
index 812e192d..f0f7b118 100644
--- a/app/components/Viewer/Generic/Model/PointsOptions.vue
+++ b/app/components/Viewer/Generic/Model/PointsOptions.vue
@@ -1,7 +1,7 @@
 <script setup>
+  import SurfacePoints from "@ogw_front/assets/viewer_svgs/surface_points.svg"
   import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
   import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
-  import SurfacePoints from "@ogw_front/assets/viewer_svgs/surface_points.svg"
 
   import { useDataStyleStore } from "@ogw_front/stores/data_style"
   import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
@@ -9,11 +9,11 @@
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 
-  const id = toRef(() => props.itemProps.id)
+  const id = toRef(() => itemProps.id)
 
   const visibility = computed({
     get: () => dataStyleStore.modelPointsVisibility(id.value),
@@ -33,7 +33,7 @@
 
 <template>
   <ViewerContextMenuItem
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     tooltip="Points options"
     :btn_image="SurfacePoints"
   >
diff --git a/app/components/Viewer/Grid/2D/CellsOptions.vue b/app/components/Viewer/Grid/2D/CellsOptions.vue
index 7eeeab6c..f69f25ac 100644
--- a/app/components/Viewer/Grid/2D/CellsOptions.vue
+++ b/app/components/Viewer/Grid/2D/CellsOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshCellsOptions from "@ogw_front/components/Viewer/Generic/Mesh/CellsOptions"
   import Grid2D_Cells from "@ogw_front/assets/viewer_svgs/grid_2d_cells.svg"
+  import ViewerGenericMeshCellsOptions from "@ogw_front/components/Viewer/Generic/Mesh/CellsOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshCellsOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="Grid2D_Cells"
     tooltip="Cells options"
   />
diff --git a/app/components/Viewer/Grid/2D/EdgesOptions.vue b/app/components/Viewer/Grid/2D/EdgesOptions.vue
index 44a69a3d..78950f55 100644
--- a/app/components/Viewer/Grid/2D/EdgesOptions.vue
+++ b/app/components/Viewer/Grid/2D/EdgesOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
   import Grid2D_Edges from "@ogw_front/assets/viewer_svgs/grid_2d_edges.svg"
+  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshEdgesOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="Grid2D_Edges"
   />
 </template>
diff --git a/app/components/Viewer/Grid/2D/PointsOptions.vue b/app/components/Viewer/Grid/2D/PointsOptions.vue
index fa6fe4ee..eb3d20a4 100644
--- a/app/components/Viewer/Grid/2D/PointsOptions.vue
+++ b/app/components/Viewer/Grid/2D/PointsOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
   import Grid2D_Points from "@ogw_front/assets/viewer_svgs/grid_2d_points.svg"
+  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshPointsOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="Grid2D_Points"
   />
 </template>
diff --git a/app/components/Viewer/Grid/3D/CellsOptions.vue b/app/components/Viewer/Grid/3D/CellsOptions.vue
index cf992efd..66896ed7 100644
--- a/app/components/Viewer/Grid/3D/CellsOptions.vue
+++ b/app/components/Viewer/Grid/3D/CellsOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshCellsOptions from "@ogw_front/components/Viewer/Generic/Mesh/CellsOptions"
   import Grid3DCells from "@ogw_front/assets/viewer_svgs/grid_3d_cells.svg"
+  import ViewerGenericMeshCellsOptions from "@ogw_front/components/Viewer/Generic/Mesh/CellsOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshCellsOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="Grid3DCells"
     tooltip="Cells options"
   />
diff --git a/app/components/Viewer/Grid/3D/EdgesOptions.vue b/app/components/Viewer/Grid/3D/EdgesOptions.vue
index 032fc462..d305adc7 100644
--- a/app/components/Viewer/Grid/3D/EdgesOptions.vue
+++ b/app/components/Viewer/Grid/3D/EdgesOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
   import Grid3D_Edges from "@ogw_front/assets/viewer_svgs/grid_3d_edges.svg"
+  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshEdgesOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="Grid3D_Edges"
   />
 </template>
diff --git a/app/components/Viewer/Grid/3D/FacetsOptions.vue b/app/components/Viewer/Grid/3D/FacetsOptions.vue
index 7d0fc1e9..974a9893 100644
--- a/app/components/Viewer/Grid/3D/FacetsOptions.vue
+++ b/app/components/Viewer/Grid/3D/FacetsOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions"
   import Grid3D_Facets from "@ogw_front/assets/viewer_svgs/grid_3d_facets.svg"
+  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshPolygonsOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="Grid3D_Facets"
     tooltip="Facets options"
   />
diff --git a/app/components/Viewer/Grid/3D/PointsOptions.vue b/app/components/Viewer/Grid/3D/PointsOptions.vue
index 683ee950..923b9de0 100644
--- a/app/components/Viewer/Grid/3D/PointsOptions.vue
+++ b/app/components/Viewer/Grid/3D/PointsOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
   import Grid3D_Points from "@ogw_front/assets/viewer_svgs/grid_3d_points.svg"
+  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshPointsOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="Grid3D_Points"
   />
 </template>
diff --git a/app/components/Viewer/HybridSolid/EdgesOptions.vue b/app/components/Viewer/HybridSolid/EdgesOptions.vue
index 04e3ab77..35eda702 100644
--- a/app/components/Viewer/HybridSolid/EdgesOptions.vue
+++ b/app/components/Viewer/HybridSolid/EdgesOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
   import HybridSolidEdges from "@ogw_front/assets/viewer_svgs/solid_edges.svg"
+  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshEdgesOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="HybridSolidEdges"
   />
 </template>
diff --git a/app/components/Viewer/HybridSolid/PointsOptions.vue b/app/components/Viewer/HybridSolid/PointsOptions.vue
index ea5ac0f4..8c69f9b9 100644
--- a/app/components/Viewer/HybridSolid/PointsOptions.vue
+++ b/app/components/Viewer/HybridSolid/PointsOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
   import HybridSolidPoints from "@ogw_front/assets/viewer_svgs/solid_points.svg"
+  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshPointsOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="HybridSolidPoints"
   />
 </template>
diff --git a/app/components/Viewer/HybridSolid/PolygonsOptions.vue b/app/components/Viewer/HybridSolid/PolygonsOptions.vue
index 333772b3..1a1dfda8 100644
--- a/app/components/Viewer/HybridSolid/PolygonsOptions.vue
+++ b/app/components/Viewer/HybridSolid/PolygonsOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions"
   import HybridSolidPolygons from "@ogw_front/assets/viewer_svgs/solid_facets.svg"
+  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshPolygonsOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="HybridSolidPolygons"
   />
 </template>
diff --git a/app/components/Viewer/HybridSolid/PolyhedraOptions.vue b/app/components/Viewer/HybridSolid/PolyhedraOptions.vue
index b31dcc7b..3b4786c0 100644
--- a/app/components/Viewer/HybridSolid/PolyhedraOptions.vue
+++ b/app/components/Viewer/HybridSolid/PolyhedraOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshPolyhedraOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolyhedraOptions"
   import HybridSolidPolyhedra from "@ogw_front/assets/viewer_svgs/solid_polyhedra.svg"
+  import ViewerGenericMeshPolyhedraOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolyhedraOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshPolyhedraOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="HybridSolidPolyhedra"
   />
 </template>
diff --git a/app/components/Viewer/Options/CellAttributeSelector.vue b/app/components/Viewer/Options/CellAttributeSelector.vue
index 532cb6f2..4c54d7b8 100644
--- a/app/components/Viewer/Options/CellAttributeSelector.vue
+++ b/app/components/Viewer/Options/CellAttributeSelector.vue
@@ -2,7 +2,7 @@
   import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
   import { useGeodeStore } from "@ogw_front/stores/geode"
 
-  const props = defineProps({
+  const { id } = defineProps({
     id: { type: String, required: true },
   })
 
@@ -13,7 +13,7 @@
   const geodeStore = useGeodeStore()
 
   onMounted(() => {
-    if (model.value != null) {
+    if (model.value !== null) {
       cell_attribute_name.value = model.value.name
     }
   })
@@ -31,7 +31,7 @@
     geodeStore.request(
       back_schemas.opengeodeweb_back.cell_attribute_names,
       {
-        id: props.id,
+        id: id,
       },
       {
         response_function: (response) => {
diff --git a/app/components/Viewer/Options/ColoringTypeSelector.vue b/app/components/Viewer/Options/ColoringTypeSelector.vue
index 6c3d86b3..c2425ce8 100644
--- a/app/components/Viewer/Options/ColoringTypeSelector.vue
+++ b/app/components/Viewer/Options/ColoringTypeSelector.vue
@@ -1,11 +1,11 @@
 <script setup>
+  import ViewerOptionsCellAttributeSelector from "@ogw_front/components/Viewer/Options/CellAttributeSelector"
   import ViewerOptionsColorPicker from "@ogw_front/components/Viewer/Options/ColorPicker"
-  import ViewerOptionsTexturesSelector from "@ogw_front/components/Viewer/Options/TexturesSelector"
-  import ViewerOptionsVertexAttributeSelector from "@ogw_front/components/Viewer/Options/VertexAttributeSelector"
   import ViewerOptionsEdgeAttributeSelector from "@ogw_front/components/Viewer/Options/EdgeAttributeSelector"
   import ViewerOptionsPolygonAttributeSelector from "@ogw_front/components/Viewer/Options/PolygonAttributeSelector"
-  import ViewerOptionsCellAttributeSelector from "@ogw_front/components/Viewer/Options/CellAttributeSelector"
   import ViewerOptionsPolyhedronAttributeSelector from "@ogw_front/components/Viewer/Options/PolyhedronAttributeSelector"
+  import ViewerOptionsTexturesSelector from "@ogw_front/components/Viewer/Options/TexturesSelector"
+  import ViewerOptionsVertexAttributeSelector from "@ogw_front/components/Viewer/Options/VertexAttributeSelector"
 
   const coloring_style_key = defineModel("coloring_style_key")
 
@@ -17,29 +17,17 @@
   const polygon_attribute = defineModel("polygon_attribute")
   const polyhedron_attribute = defineModel("polyhedron_attribute")
 
-  const props = defineProps({
+  const { id } = defineProps({
     id: { type: String, required: true },
   })
 
-  const has_color = computed(() => (color.value !== undefined ? true : false))
-  const has_textures = computed(() =>
-    textures.value !== undefined ? true : false,
-  )
-  const has_vertex = computed(() =>
-    vertex_attribute.value !== undefined ? true : false,
-  )
-  const has_edge = computed(() =>
-    edge_attribute.value !== undefined ? true : false,
-  )
-  const has_cells = computed(() =>
-    cell_attribute.value !== undefined ? true : false,
-  )
-  const has_polygons = computed(() =>
-    polygon_attribute.value !== undefined ? true : false,
-  )
-  const has_polyhedra = computed(() =>
-    polyhedron_attribute.value !== undefined ? true : false,
-  )
+  const has_color = computed(() => color.value !== undefined)
+  const has_textures = computed(() => textures.value !== undefined)
+  const has_vertex = computed(() => vertex_attribute.value !== undefined)
+  const has_edge = computed(() => edge_attribute.value !== undefined)
+  const has_cells = computed(() => cell_attribute.value !== undefined)
+  const has_polygons = computed(() => polygon_attribute.value !== undefined)
+  const has_polyhedra = computed(() => polyhedron_attribute.value !== undefined)
 
   const color_dict = { name: "Color", value: "color" }
   const textures_dict = { name: "Textures", value: "textures" }
@@ -61,12 +49,8 @@
     if (has_polygons.value) array.push(polygon_dict)
     if (has_polyhedra.value) array.push(polyhedron_dict)
 
-    const labels = array.map((coloring) => {
-      return coloring.name
-    })
-    const values = array.map((coloring) => {
-      return coloring.value
-    })
+    const labels = array.map((coloring) => coloring.name)
+    const values = array.map((coloring) => coloring.value)
 
     return { labels, values }
   })
diff --git a/app/components/Viewer/Options/EdgeAttributeSelector.vue b/app/components/Viewer/Options/EdgeAttributeSelector.vue
index f44ba195..9a43b6ba 100644
--- a/app/components/Viewer/Options/EdgeAttributeSelector.vue
+++ b/app/components/Viewer/Options/EdgeAttributeSelector.vue
@@ -6,7 +6,7 @@
 
   const model = defineModel()
 
-  const props = defineProps({
+  const { id } = defineProps({
     id: { type: String, required: true },
   })
 
@@ -14,7 +14,7 @@
   const edge_attribute_names = ref([])
 
   onMounted(() => {
-    if (model.value != null) {
+    if (model.value !== null) {
       edge_attribute_name.value = model.value.name
     }
   })
@@ -29,7 +29,7 @@
   function get_edge_attribute_names() {
     geodeStore.request(
       back_schemas.opengeodeweb_back.edge_attribute_names,
-      { id: props.id },
+      { id: id },
       {
         response_function: (response) => {
           edge_attribute_names.value = response.edge_attribute_names
@@ -43,7 +43,7 @@
   })
 
   watch(
-    () => props.id,
+    () => id,
     () => {
       get_edge_attribute_names()
     },
diff --git a/app/components/Viewer/Options/PolygonAttributeSelector.vue b/app/components/Viewer/Options/PolygonAttributeSelector.vue
index 9ddd626a..a1fc94d3 100644
--- a/app/components/Viewer/Options/PolygonAttributeSelector.vue
+++ b/app/components/Viewer/Options/PolygonAttributeSelector.vue
@@ -2,7 +2,7 @@
   import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
   import { useGeodeStore } from "@ogw_front/stores/geode"
 
-  const props = defineProps({
+  const { id } = defineProps({
     id: { type: String, required: true },
   })
 
@@ -13,7 +13,7 @@
   const geodeStore = useGeodeStore()
 
   onMounted(() => {
-    if (model.value != null) {
+    if (model.value !== null) {
       polygon_attribute_name.value = model.value.name
     }
   })
@@ -31,7 +31,7 @@
     geodeStore.request(
       back_schemas.opengeodeweb_back.polygon_attribute_names,
       {
-        id: props.id,
+        id: id,
       },
       {
         response_function: (response) => {
diff --git a/app/components/Viewer/Options/PolyhedronAttributeSelector.vue b/app/components/Viewer/Options/PolyhedronAttributeSelector.vue
index fdf7c60d..28c7df4d 100644
--- a/app/components/Viewer/Options/PolyhedronAttributeSelector.vue
+++ b/app/components/Viewer/Options/PolyhedronAttributeSelector.vue
@@ -7,7 +7,7 @@
   const polyhedron_attribute_name = ref("")
 
   onMounted(() => {
-    if (model.value != null) {
+    if (model.value !== null) {
       polyhedron_attribute_name.value = model.value.name
     }
   })
@@ -20,7 +20,7 @@
     model.value = polyhedron_attribute
   })
 
-  const props = defineProps({
+  const { id } = defineProps({
     id: { type: String, required: true },
   })
 
@@ -34,7 +34,7 @@
   function getVertexAttributes() {
     geodeStore.request(
       back_schemas.opengeodeweb_back.polyhedron_attribute_names,
-      { id: props.id },
+      { id: id },
       {
         response_function: (response) => {
           polyhedron_attribute_names.value = response.polyhedron_attribute_names
diff --git a/app/components/Viewer/Options/TextureItem.vue b/app/components/Viewer/Options/TextureItem.vue
index 46dee040..c04bf6ea 100644
--- a/app/components/Viewer/Options/TextureItem.vue
+++ b/app/components/Viewer/Options/TextureItem.vue
@@ -1,21 +1,21 @@
 <script setup>
-  import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
   import FileUploader from "@ogw_front/components/FileUploader"
+  import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
   import { useGeodeStore } from "@ogw_front/stores/geode"
 
   const emit = defineEmits(["update_value"])
 
-  const props = defineProps({
+  const { id } = defineProps({
     id: { type: String, required: true },
     texture_id: { type: String, required: true },
     texture_name: { type: String, required: true },
   })
 
   const texture_name = ref("")
-  texture_name.value = props.texture_name
+  texture_name.value = texture_name
 
   const texture_id = ref("")
-  texture_id.value = props.texture_id
+  texture_id.value = texture_id
 
   const texture_coordinates = ref([])
   const geodeStore = useGeodeStore()
@@ -27,7 +27,7 @@
   function getTextureCoordinates() {
     geodeStore.request(
       back_schemas.opengeodeweb_back.texture_coordinates,
-      { id: props.id },
+      { id: id },
       {
         response_function: (response) => {
           texture_coordinates.value = response.texture_coordinates
diff --git a/app/components/Viewer/Options/TexturesSelector.vue b/app/components/Viewer/Options/TexturesSelector.vue
index 6466792f..7f125f34 100644
--- a/app/components/Viewer/Options/TexturesSelector.vue
+++ b/app/components/Viewer/Options/TexturesSelector.vue
@@ -3,14 +3,14 @@
 
   const textures = defineModel()
 
-  const props = defineProps({
+  const { id } = defineProps({
     id: { type: String, required: true },
   })
 
   const internal_textures = ref([])
 
   onMounted(() => {
-    if (textures.value != null) {
+    if (textures.value !== null) {
       internal_textures.value = textures.value
     } else {
       internal_textures.value = [{ id: "", texture_name: "" }]
@@ -19,9 +19,9 @@
 
   function update_value_event($event, index) {
     internal_textures.value[index][$event.key] = $event.value
-    const filtered = internal_textures.value.filter((texture) => {
-      return texture.texture_name !== "" && texture.id !== ""
-    })
+    const filtered = internal_textures.value.filter(
+      (texture) => texture.texture_name !== "" && texture.id !== "",
+    )
     if (filtered.length !== 0) {
       textures.value = filtered
     }
diff --git a/app/components/Viewer/Options/VertexAttributeSelector.vue b/app/components/Viewer/Options/VertexAttributeSelector.vue
index ce639dcc..9051619c 100644
--- a/app/components/Viewer/Options/VertexAttributeSelector.vue
+++ b/app/components/Viewer/Options/VertexAttributeSelector.vue
@@ -6,7 +6,7 @@
 
   const model = defineModel()
 
-  const props = defineProps({
+  const { id } = defineProps({
     id: { type: String, required: true },
   })
 
@@ -14,7 +14,7 @@
   const vertex_attribute_names = ref([])
 
   onMounted(() => {
-    if (model.value != null) {
+    if (model.value !== null) {
       vertex_attribute_name.value = model.value.name
     }
   })
@@ -32,7 +32,7 @@
   function getVertexAttributes() {
     geodeStore.request(
       back_schemas.opengeodeweb_back.vertex_attribute_names,
-      { id: props.id },
+      { id: id },
       {
         response_function: (response) => {
           vertex_attribute_names.value = response.vertex_attribute_names
diff --git a/app/components/Viewer/PointSet/SpecificPointsOptions.vue b/app/components/Viewer/PointSet/SpecificPointsOptions.vue
index 4ab46a48..e9b6802a 100644
--- a/app/components/Viewer/PointSet/SpecificPointsOptions.vue
+++ b/app/components/Viewer/PointSet/SpecificPointsOptions.vue
@@ -1,8 +1,8 @@
 <script setup>
+  import PointSetPoints from "@ogw_front/assets/viewer_svgs/point_set_points.svg"
   import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
   import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector"
-  import PointSetPoints from "@ogw_front/assets/viewer_svgs/point_set_points.svg"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
 
   import { useDataStyleStore } from "@ogw_front/stores/data_style"
   import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
@@ -10,11 +10,11 @@
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 
-  const id = toRef(() => props.itemProps.id)
+  const id = toRef(() => itemProps.id)
 
   const visibility = computed({
     get: () => dataStyleStore.meshPointsVisibility(id.value),
@@ -55,7 +55,7 @@
 
 <template>
   <ViewerContextMenuItem
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     tooltip="Points options"
     :btn_image="PointSetPoints"
   >
diff --git a/app/components/Viewer/PolygonalSurface/EdgesOptions.vue b/app/components/Viewer/PolygonalSurface/EdgesOptions.vue
index 0ff83437..f955ef62 100644
--- a/app/components/Viewer/PolygonalSurface/EdgesOptions.vue
+++ b/app/components/Viewer/PolygonalSurface/EdgesOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
   import PolygonalSurfaceEdges from "@ogw_front/assets/viewer_svgs/surface_edges.svg"
+  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshEdgesOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="PolygonalSurfaceEdges"
   />
 </template>
diff --git a/app/components/Viewer/PolygonalSurface/PointsOptions.vue b/app/components/Viewer/PolygonalSurface/PointsOptions.vue
index 37469d03..fab10dab 100644
--- a/app/components/Viewer/PolygonalSurface/PointsOptions.vue
+++ b/app/components/Viewer/PolygonalSurface/PointsOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
   import PolygonalSurfacePoints from "@ogw_front/assets/viewer_svgs/surface_points.svg"
+  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshPointsOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="PolygonalSurfacePoints"
   />
 </template>
diff --git a/app/components/Viewer/PolygonalSurface/SpecificPolygonsOptions.vue b/app/components/Viewer/PolygonalSurface/SpecificPolygonsOptions.vue
index a1d05fa5..1cf289b5 100644
--- a/app/components/Viewer/PolygonalSurface/SpecificPolygonsOptions.vue
+++ b/app/components/Viewer/PolygonalSurface/SpecificPolygonsOptions.vue
@@ -1,8 +1,8 @@
 <script setup>
+  import PolygonalSurfacePolygons from "@ogw_front/assets/viewer_svgs/surface_triangles.svg"
   import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
   import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector"
-  import PolygonalSurfacePolygons from "@ogw_front/assets/viewer_svgs/surface_triangles.svg"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
 
   import { useDataStyleStore } from "@ogw_front/stores/data_style"
   import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
@@ -10,12 +10,12 @@
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
     tooltip: { type: String, required: false, default: "Polygons options" },
   })
 
-  const id = toRef(() => props.itemProps.id)
+  const id = toRef(() => itemProps.id)
 
   const visibility = computed({
     get: () => dataStyleStore.meshPolygonsVisibility(id.value),
@@ -63,8 +63,8 @@
 
 <template>
   <ViewerContextMenuItem
-    :itemProps="props.itemProps"
-    :tooltip="props.tooltip"
+    :itemProps="itemProps"
+    :tooltip="tooltip"
     :btn_image="PolygonalSurfacePolygons"
   >
     <template #options>
diff --git a/app/components/Viewer/Solid/EdgesOptions.vue b/app/components/Viewer/Solid/EdgesOptions.vue
index cb0bbe44..7c6165aa 100644
--- a/app/components/Viewer/Solid/EdgesOptions.vue
+++ b/app/components/Viewer/Solid/EdgesOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
   import SolidEdges from "@ogw_front/assets/viewer_svgs/solid_edges.svg"
+  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshEdgesOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="SolidEdges"
   />
 </template>
diff --git a/app/components/Viewer/Solid/PointsOptions.vue b/app/components/Viewer/Solid/PointsOptions.vue
index 8fc39d93..cc73b3f2 100644
--- a/app/components/Viewer/Solid/PointsOptions.vue
+++ b/app/components/Viewer/Solid/PointsOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
   import SolidPoints from "@ogw_front/assets/viewer_svgs/solid_points.svg"
+  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshPointsOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="SolidPoints"
   />
 </template>
diff --git a/app/components/Viewer/Solid/PolygonsOptions.vue b/app/components/Viewer/Solid/PolygonsOptions.vue
index d40bbbb5..8b73cd48 100644
--- a/app/components/Viewer/Solid/PolygonsOptions.vue
+++ b/app/components/Viewer/Solid/PolygonsOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions"
   import SolidFacets from "@ogw_front/assets/viewer_svgs/solid_facets.svg"
+  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshPolygonsOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="SolidFacets"
   />
 </template>
diff --git a/app/components/Viewer/Solid/SpecificPolyhedraOptions.vue b/app/components/Viewer/Solid/SpecificPolyhedraOptions.vue
index 9011843c..be0bc693 100644
--- a/app/components/Viewer/Solid/SpecificPolyhedraOptions.vue
+++ b/app/components/Viewer/Solid/SpecificPolyhedraOptions.vue
@@ -1,8 +1,8 @@
 <script setup>
+  import SolidPolyhedra from "@ogw_front/assets/viewer_svgs/solid_polyhedra.svg"
   import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem"
-  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
   import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector"
-  import SolidPolyhedra from "@ogw_front/assets/viewer_svgs/solid_polyhedra.svg"
+  import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch"
 
   import { useDataStyleStore } from "@ogw_front/stores/data_style"
   import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
@@ -10,12 +10,12 @@
   const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
     tooltip: { type: String, required: false, default: "Polyhedra options" },
   })
 
-  const id = toRef(() => props.itemProps.id)
+  const id = toRef(() => itemProps.id)
 
   const visibility = computed({
     get: () => dataStyleStore.meshPolyhedraVisibility(id.value),
@@ -56,8 +56,8 @@
 
 <template>
   <ViewerContextMenuItem
-    :itemProps="props.itemProps"
-    :tooltip="props.tooltip"
+    :itemProps="itemProps"
+    :tooltip="tooltip"
     :btn_image="SolidPolyhedra"
   >
     <template #options>
diff --git a/app/components/Viewer/TetrahedralSolid/TetrahedraOptions.vue b/app/components/Viewer/TetrahedralSolid/TetrahedraOptions.vue
index c3851fdd..d94a2b70 100644
--- a/app/components/Viewer/TetrahedralSolid/TetrahedraOptions.vue
+++ b/app/components/Viewer/TetrahedralSolid/TetrahedraOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshPolyhedraOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolyhedraOptions"
   import TetrahedralSolidTetrahedra from "@ogw_front/assets/viewer_svgs/solid_polyhedra.svg"
+  import ViewerGenericMeshPolyhedraOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolyhedraOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshPolyhedraOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="TetrahedralSolidTetrahedra"
     tooltip="Tetrahedra options"
   />
diff --git a/app/components/Viewer/TetrahedralSolid/TrianglesOptions.vue b/app/components/Viewer/TetrahedralSolid/TrianglesOptions.vue
index b95375d5..38a071ce 100644
--- a/app/components/Viewer/TetrahedralSolid/TrianglesOptions.vue
+++ b/app/components/Viewer/TetrahedralSolid/TrianglesOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions"
   import TetrahedralSolidTriangles from "@ogw_front/assets/viewer_svgs/solid_facets.svg"
+  import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshPolygonsOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="TetrahedralSolidTriangles"
     tooltip="Triangles options"
   />
diff --git a/app/components/Viewer/Tree/ObjectTree.vue b/app/components/Viewer/Tree/ObjectTree.vue
index afe46fc1..6c0de8ab 100644
--- a/app/components/Viewer/Tree/ObjectTree.vue
+++ b/app/components/Viewer/Tree/ObjectTree.vue
@@ -1,9 +1,11 @@
 <script setup>
   import ViewerBreadCrumb from "@ogw_front/components/Viewer/BreadCrumb"
-  import ViewerTreeObject from "@ogw_front/components/Viewer/TreeObject"
   import ViewerTreeComponent from "@ogw_front/components/Viewer/TreeComponent"
+  import ViewerTreeObject from "@ogw_front/components/Viewer/TreeObject"
   import { useTreeviewStore } from "@ogw_front/stores/treeview"
 
+  const WIDTH_MIN = 150
+
   const treeviewStore = useTreeviewStore()
   const emit = defineEmits(["show-menu"])
 
@@ -14,16 +16,16 @@
   function onResizeStart(event) {
     const startWidth = treeviewStore.panelWidth
     const startX = event.clientX
-    const resize = (e) => {
-      const deltaX = e.clientX - startX
+    function resize(event) {
+      const deltaX = event.clientX - startX
       const newWidth = Math.max(
-        150,
+        WIDTH_MIN,
         Math.min(startWidth + deltaX, window.innerWidth),
       )
       treeviewStore.setPanelWidth(newWidth)
       document.body.style.userSelect = "none"
     }
-    const stopResize = () => {
+    function stopResize() {
       document.removeEventListener("mousemove", resize)
       document.removeEventListener("mouseup", stopResize)
       document.body.style.userSelect = ""
@@ -31,10 +33,6 @@
     document.addEventListener("mousemove", resize)
     document.addEventListener("mouseup", stopResize)
   }
-
-  onMounted(() => {})
-
-  onUnmounted(() => {})
 </script>
 
 <template>
diff --git a/app/components/Viewer/TreeComponent.vue b/app/components/Viewer/TreeComponent.vue
index 66a1704f..4fe12534 100644
--- a/app/components/Viewer/TreeComponent.vue
+++ b/app/components/Viewer/TreeComponent.vue
@@ -9,13 +9,13 @@
   const dataStore = useDataStore()
   const hybridViewerStore = useHybridViewerStore()
 
-  const props = defineProps({ id: { type: String, required: true } })
+  const { id } = defineProps({ id: { type: String, required: true } })
 
   const emit = defineEmits(["show-menu"])
 
-  const items = dataStore.formatedMeshComponents(props.id)
+  const items = dataStore.formatedMeshComponents(id)
   const mesh_components_selection = ref(
-    dataStyleStore.visibleMeshComponents(props.id),
+    dataStyleStore.visibleMeshComponents(id),
   )
 
   watch(
@@ -34,48 +34,28 @@
           removed_blocks,
         ] = sortMeshComponents(removed)
         if (added_corners.length > 0) {
-          dataStyleStore.setModelCornersVisibility(
-            props.id,
-            added_corners,
-            true,
-          )
+          dataStyleStore.setModelCornersVisibility(id, added_corners, true)
         }
         if (added_lines.length > 0) {
-          dataStyleStore.setModelLinesVisibility(props.id, added_lines, true)
+          dataStyleStore.setModelLinesVisibility(id, added_lines, true)
         }
         if (added_surfaces.length > 0) {
-          dataStyleStore.setModelSurfacesVisibility(
-            props.id,
-            added_surfaces,
-            true,
-          )
+          dataStyleStore.setModelSurfacesVisibility(id, added_surfaces, true)
         }
         if (added_blocks.length > 0) {
-          dataStyleStore.setModelBlocksVisibility(props.id, added_blocks, true)
+          dataStyleStore.setModelBlocksVisibility(id, added_blocks, true)
         }
         if (removed_corners.length > 0) {
-          dataStyleStore.setModelCornersVisibility(
-            props.id,
-            removed_corners,
-            false,
-          )
+          dataStyleStore.setModelCornersVisibility(id, removed_corners, false)
         }
         if (removed_lines.length > 0) {
-          dataStyleStore.setModelLinesVisibility(props.id, removed_lines, false)
+          dataStyleStore.setModelLinesVisibility(id, removed_lines, false)
         }
         if (removed_surfaces.length > 0) {
-          dataStyleStore.setModelSurfacesVisibility(
-            props.id,
-            removed_surfaces,
-            false,
-          )
+          dataStyleStore.setModelSurfacesVisibility(id, removed_surfaces, false)
         }
         if (removed_blocks.length > 0) {
-          dataStyleStore.setModelBlocksVisibility(
-            props.id,
-            removed_blocks,
-            false,
-          )
+          dataStyleStore.setModelBlocksVisibility(id, removed_blocks, false)
         }
         hybridViewerStore.remoteRender()
       }
@@ -84,12 +64,12 @@
   )
 
   function sortMeshComponents(items) {
-    var corner_ids = [],
-      line_ids = [],
-      surface_ids = [],
-      block_ids = []
+    const corner_ids = []
+    const line_ids = []
+    const surface_ids = []
+    const block_ids = []
     for (const item of items) {
-      const item_type = dataStore.meshComponentType(props.id, item)
+      const item_type = dataStore.meshComponentType(id, item)
       if (item_type === "corner") corner_ids.push(item)
       else if (item_type === "line") line_ids.push(item)
       else if (item_type === "surface") surface_ids.push(item)
diff --git a/app/components/Viewer/TreeObject.vue b/app/components/Viewer/TreeObject.vue
index 151581a9..d5176c61 100644
--- a/app/components/Viewer/TreeObject.vue
+++ b/app/components/Viewer/TreeObject.vue
@@ -1,7 +1,7 @@
 <script setup>
-  import { useTreeviewStore } from "@ogw_front/stores/treeview"
   import { useDataStyleStore } from "@ogw_front/stores/data_style"
   import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+  import { useTreeviewStore } from "@ogw_front/stores/treeview"
 
   import { compareSelections } from "@ogw_front/utils/treeview"
 
@@ -18,8 +18,8 @@
   watch(
     () => treeviewStore.selection,
     async (current, previous) => {
-      if (!previous) previous = []
-      if (current.value === previous) {
+      const oldSelection = previous || []
+      if (current === oldSelection) {
         return
       }
       const { added, removed } = compareSelections(current, previous)
@@ -29,6 +29,10 @@
       for (const item of removed) {
         await dataStyleStore.setVisibility(item.id, false)
       }
+
+      await Promise.all(
+        removed.map((item) => dataStyleStore.setVisibility(item.id, false)),
+      )
       hybridViewerStore.remoteRender()
     },
   )
diff --git a/app/components/Viewer/TriangulatedSurface/EdgesOptions.vue b/app/components/Viewer/TriangulatedSurface/EdgesOptions.vue
index 208423eb..4fd000e7 100644
--- a/app/components/Viewer/TriangulatedSurface/EdgesOptions.vue
+++ b/app/components/Viewer/TriangulatedSurface/EdgesOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
   import SurfaceEdges from "@ogw_front/assets/viewer_svgs/surface_edges.svg"
+  import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshEdgesOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="SurfaceEdges"
   />
 </template>
diff --git a/app/components/Viewer/TriangulatedSurface/PointsOptions.vue b/app/components/Viewer/TriangulatedSurface/PointsOptions.vue
index 89275031..c84d0976 100644
--- a/app/components/Viewer/TriangulatedSurface/PointsOptions.vue
+++ b/app/components/Viewer/TriangulatedSurface/PointsOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
   import TriangulatedSurfaceEdgesPoints from "@ogw_front/assets/viewer_svgs/surface_points.svg"
+  import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerGenericMeshPointsOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="TriangulatedSurfaceEdgesPoints"
   />
 </template>
diff --git a/app/components/Viewer/TriangulatedSurface/TrianglesOptions.vue b/app/components/Viewer/TriangulatedSurface/TrianglesOptions.vue
index 02c843bb..f6ee2916 100644
--- a/app/components/Viewer/TriangulatedSurface/TrianglesOptions.vue
+++ b/app/components/Viewer/TriangulatedSurface/TrianglesOptions.vue
@@ -1,15 +1,15 @@
 <script setup>
-  import ViewerSpecificPolygonsOptions from "@ogw_front/components/Viewer/PolygonalSurface/SpecificPolygonsOptions"
   import TriangulatedSurfaceTriangles from "@ogw_front/assets/viewer_svgs/surface_triangles.svg"
+  import ViewerSpecificPolygonsOptions from "@ogw_front/components/Viewer/PolygonalSurface/SpecificPolygonsOptions"
 
-  const props = defineProps({
+  const { itemProps } = defineProps({
     itemProps: { type: Object, required: true },
   })
 </script>
 
 <template>
   <ViewerSpecificPolygonsOptions
-    :itemProps="props.itemProps"
+    :itemProps="itemProps"
     :btn_image="TriangulatedSurfaceTriangles"
     tooltip="Triangles options"
   />
diff --git a/app/components/Wrapper.vue b/app/components/Wrapper.vue
index 0a524c56..36e39754 100644
--- a/app/components/Wrapper.vue
+++ b/app/components/Wrapper.vue
@@ -7,10 +7,9 @@
 
   const infraStore = useInfraStore()
 
-  const props = defineProps({
+  const { versions_schema } = defineProps({
     versions_schema: { type: Object, required: true },
   })
-  const { versions_schema } = props
 </script>
 
 <template>
diff --git a/app/components/ZScaling.vue b/app/components/ZScaling.vue
index c47eaaea..6f850ea6 100644
--- a/app/components/ZScaling.vue
+++ b/app/components/ZScaling.vue
@@ -1,6 +1,6 @@
 <script setup>
   const zScale = defineModel({ type: Number, default: 1 })
-  const props = defineProps({
+  const { width } = defineProps({
     width: { type: Number, default: 400 },
   })
 </script>
diff --git a/app/composables/project_manager.js b/app/composables/project_manager.js
index 7590090f..39c7d8ad 100644
--- a/app/composables/project_manager.js
+++ b/app/composables/project_manager.js
@@ -5,15 +5,15 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 import { importWorkflowFromSnapshot } from "@ogw_front/utils/file_import_workflow"
 
 import { useAppStore } from "@ogw_front/stores/app"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
 import { useDataStore } from "@ogw_front/stores/data"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
 import { useGeodeStore } from "@ogw_front/stores/geode"
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
 import { useTreeviewStore } from "@ogw_front/stores/treeview"
 import { useViewerStore } from "@ogw_front/stores/viewer"
 
 export function useProjectManager() {
-  const exportProject = async function () {
+  async function exportProject() {
     console.log("[export triggered]")
     const appStore = useAppStore()
     const geodeStore = useGeodeStore()
@@ -23,14 +23,14 @@ export function useProjectManager() {
 
     const result = await $fetch(schema.$id, {
       baseURL: geodeStore.base_url,
-      method: schema.methods.filter((m) => m !== "OPTIONS")[0],
+      method: schema.methods.find((method) => method !== "OPTIONS"),
       body: { snapshot, filename: defaultName },
     })
     fileDownload(result, defaultName)
     return { result }
   }
 
-  const importProjectFile = async function (file) {
+  async function importProjectFile(file) {
     const geodeStore = useGeodeStore()
     const dataStyleStore = useDataStyleStore()
     const viewerStore = useViewerStore()
@@ -40,7 +40,7 @@ export function useProjectManager() {
 
     await viewerStore.ws_connect()
 
-    const client = viewerStore.client
+    const { client } = viewerStore
     if (client && client.getConnection && client.getConnection().getSession) {
       await client
         .getConnection()
@@ -75,7 +75,7 @@ export function useProjectManager() {
 
     treeviewStore.isImporting = true
 
-    const client2 = viewerStore.client
+    const { client: client2 } = viewerStore
     if (
       client2 &&
       client2.getConnection &&
diff --git a/app/plugins/auto_store_register.js b/app/plugins/auto_store_register.js
index d023c45e..026e97f3 100644
--- a/app/plugins/auto_store_register.js
+++ b/app/plugins/auto_store_register.js
@@ -1,6 +1,6 @@
 import { useAppStore } from "@ogw_front/stores/app"
 
-const autoStoreRegister = ({ store }) => {
+function autoStoreRegister({ store }) {
   if (store.$id === "app") {
     return
   }
diff --git a/app/stores/app.js b/app/stores/app.js
index a17a2aec..7f3fb4f4 100644
--- a/app/stores/app.js
+++ b/app/stores/app.js
@@ -22,23 +22,18 @@ export const useAppStore = defineStore("app", () => {
     console.log(
       `[AppStore] Exporting stores, total registered: ${stores.length}`,
     )
-    for (const store of stores) {
-      console.log(
-        `[AppStore] Checking store: ${store.$id}, has exportStores: ${!!store.exportStores}`,
-      )
-      if (!store.exportStores) continue
-      const storeId = store.$id
-      try {
-        snapshot[storeId] = await store.exportStores(params)
-        console.log(
-          `[AppStore] Exported store "${storeId}":`,
-          snapshot[storeId],
-        )
-        exportCount++
-      } catch (error) {
-        console.error(`[AppStore] Error exporting store "${storeId}":`, error)
-      }
-    }
+    await Promise.all(
+      stores.map(async (store) => {
+        if (!store.exportStores) return
+        const storeId = store.$id
+        try {
+          snapshot[storeId] = await store.exportStores(params)
+          exportCount += 1
+        } catch (error) {
+          console.error(`[AppStore] Error exporting store "${storeId}":`, error)
+        }
+      }),
+    )
     console.log(
       `[AppStore] Exported ${exportCount} stores; snapshot keys:`,
       Object.keys(snapshot),
@@ -55,20 +50,22 @@ export const useAppStore = defineStore("app", () => {
 
     let importedCount = 0
     const notFoundStores = []
-    for (const store of stores) {
-      if (!store.importStores) continue
-      const storeId = store.$id
-      if (!snapshot[storeId]) {
-        notFoundStores.push(storeId)
-        continue
-      }
-      try {
-        await store.importStores(snapshot[storeId])
-        importedCount++
-      } catch (error) {
-        console.error(`[AppStore] Error importing store "${storeId}":`, error)
-      }
-    }
+    await Promise.all(
+      stores.map(async (store) => {
+        if (!store.importStores) return
+        const storeId = store.$id
+        if (!snapshot[storeId]) {
+          notFoundStores.push(storeId)
+          return
+        }
+        try {
+          await store.importStores(snapshot[storeId])
+          importedCount += 1
+        } catch (error) {
+          console.error(`[AppStore] Error importing store "${storeId}":`, error)
+        }
+      }),
+    )
     if (notFoundStores.length > 0) {
       console.warn(
         `[AppStore] Stores not found in snapshot: ${notFoundStores.join(", ")}`,
@@ -156,7 +153,7 @@ export const useAppStore = defineStore("app", () => {
   }
 
   function getLoadedExtensions() {
-    return Array.from(loadedExtensions.value.values())
+    return [...loadedExtensions.value.values()]
   }
 
   function unloadExtension(id) {
diff --git a/app/stores/data.js b/app/stores/data.js
index f1201818..57f33342 100644
--- a/app/stores/data.js
+++ b/app/stores/data.js
@@ -1,17 +1,17 @@
 // Third party imports
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
-import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 import { database } from "../../internal/database/database.js"
 import { liveQuery } from "dexie"
 import { useObservable } from "@vueuse/rxjs"
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
 // Local constants
+import { useGeodeStore } from "@ogw_front/stores/geode"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 const back_model_schemas = back_schemas.opengeodeweb_back.models
 const viewer_generic_schemas = viewer_schemas.opengeodeweb_viewer.generic
 
-import { useViewerStore } from "@ogw_front/stores/viewer"
-import { useGeodeStore } from "@ogw_front/stores/geode"
-
 export const useDataStore = defineStore("data", () => {
   const viewerStore = useViewerStore()
 
@@ -19,7 +19,7 @@ export const useDataStore = defineStore("data", () => {
   function getItem(id) {
     if (!id) {
       const emptyRef = ref({})
-      emptyRef.fetch = async () => null
+      emptyRef.fetch = async () => ({})
       return emptyRef
     }
     if (itemCache.has(id)) {
@@ -29,7 +29,7 @@ export const useDataStore = defineStore("data", () => {
       liveQuery(() => database.data.get(id)),
       { initialValue: {} },
     )
-    observable.fetch = async () => await database.data.get(id)
+    observable.fetch = () => database.data.get(id)
     itemCache.set(id, observable)
     return observable
   }
@@ -39,45 +39,48 @@ export const useDataStore = defineStore("data", () => {
       liveQuery(() => database.data.toArray()),
       { initialValue: [] },
     )
-    observable.fetch = async () => await database.data.toArray()
+    observable.fetch = () => database.data.toArray()
     return observable
   }
 
   async function formatedMeshComponents(id) {
     const items = await database.model_components.where({ id }).toArray()
     const distinctTypes = [...new Set(items.map((item) => item.type))]
-    const formated_mesh_components = []
-    for (const type of distinctTypes) {
-      const meshComponents = await database.model_components
-        .where({ id, type })
-        .toArray()
-
-      formated_mesh_components.push({
-        id: type,
-        title: type,
-        children: meshComponents.map((meshComponent) => ({
-          id: meshComponent.geode_id,
-          title: meshComponent.name,
-          category: meshComponent.type,
-        })),
-      })
-    }
+
+    const formated_mesh_components = await Promise.all(
+      distinctTypes.map(async (type) => {
+        const meshComponents = await database.model_components
+          .where({ id, type })
+          .toArray()
+
+        return {
+          id: type,
+          title: type,
+          children: meshComponents.map((meshComponent) => ({
+            id: meshComponent.geode_id,
+            title: meshComponent.name,
+            category: meshComponent.type,
+          })),
+        }
+      }),
+    )
 
     return formated_mesh_components
   }
 
   async function meshComponentType(id, geode_id) {
-    return (
-      await database.model_components.where({ id, geode_id }).toArray()
-    ).map((component) => component.type)[0]
+    const component = await database.model_components
+      .where({ id, geode_id })
+      .first()
+    return component?.type
   }
 
   async function registerObject(id) {
-    return viewerStore.request(viewer_generic_schemas.register, { id })
+    return await viewerStore.request(viewer_generic_schemas.register, { id })
   }
 
   async function deregisterObject(id) {
-    return viewerStore.request(viewer_generic_schemas.deregister, { id })
+    return await viewerStore.request(viewer_generic_schemas.deregister, { id })
   }
 
   async function addItem(id, value) {
@@ -106,9 +109,9 @@ export const useDataStore = defineStore("data", () => {
       console.debug("[addModelComponents] No mesh components to add")
       return
     }
-    values.map((value) => {
+    for (const value of values) {
       value.created_at = new Date().toISOString()
-    })
+    }
     const serializedData = JSON.parse(JSON.stringify(values))
     await database.model_components.bulkAdd(serializedData)
   }
@@ -119,7 +122,7 @@ export const useDataStore = defineStore("data", () => {
 
   async function fetchMeshComponents(id) {
     const geodeStore = useGeodeStore()
-    return geodeStore.request(
+    return await geodeStore.request(
       back_model_schemas.mesh_components,
       { id },
       {
@@ -132,37 +135,35 @@ export const useDataStore = defineStore("data", () => {
   }
 
   async function getMeshComponentGeodeIds(id, meshComponentType) {
-    return (
-      await database.model_components
-        .where({ id, type: meshComponentType })
-        .toArray()
-    ).map((component) => component.geode_id)
+    const components = await database.model_components
+      .where({ id, type: meshComponentType })
+      .toArray()
+    return components.map((component) => component.geode_id)
   }
 
   async function getCornersGeodeIds(id) {
-    return getMeshComponentGeodeIds(id, "Corner")
+    return await getMeshComponentGeodeIds(id, "Corner")
   }
 
   async function getLinesGeodeIds(id) {
-    return getMeshComponentGeodeIds(id, "Line")
+    return await getMeshComponentGeodeIds(id, "Line")
   }
 
   async function getSurfacesGeodeIds(id) {
-    return getMeshComponentGeodeIds(id, "Surface")
+    return await getMeshComponentGeodeIds(id, "Surface")
   }
 
   async function getBlocksGeodeIds(id) {
-    return getMeshComponentGeodeIds(id, "Block")
+    return await getMeshComponentGeodeIds(id, "Block")
   }
 
   async function getMeshComponentsViewerIds(id, meshComponentGeodeIds) {
-    return (
-      await database.model_components
-        .where("id")
-        .equals(id)
-        .and((component) => meshComponentGeodeIds.includes(component.geode_id))
-        .toArray()
-    ).map((component) => component.viewer_id)
+    const components = await database.model_components
+      .where("id")
+      .equals(id)
+      .and((component) => meshComponentGeodeIds.includes(component.geode_id))
+      .toArray()
+    return components.map((component) => component.viewer_id)
   }
 
   async function exportStores() {
@@ -170,7 +171,7 @@ export const useDataStore = defineStore("data", () => {
     return { items }
   }
 
-  async function importStores(snapshot) {
+  async function importStores(_snapshot) {
     await clear()
   }
 
diff --git a/app/stores/data_style.js b/app/stores/data_style.js
index 747a59ac..f286133d 100644
--- a/app/stores/data_style.js
+++ b/app/stores/data_style.js
@@ -18,13 +18,14 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
     const item = await dataStore.getItem(id).fetch()
     const viewer_type = item?.viewer_type
     if (!viewer_type) {
-      throw new Error("Item not found or not loaded: " + id)
+      throw new Error(`Item not found or not loaded: ${id}`)
     }
 
     if (viewer_type === "mesh") {
-      return Promise.all([meshStyleStore.setMeshVisibility(id, visibility)])
-    } else if (viewer_type === "model") {
-      return Promise.all([modelStyleStore.setModelVisibility(id, visibility)])
+      return meshStyleStore.setMeshVisibility(id, visibility)
+    }
+    if (viewer_type === "model") {
+      return modelStyleStore.setModelVisibility(id, visibility)
     }
     throw new Error("Unknown viewer_type")
   }
@@ -33,23 +34,23 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
     const item = await dataStore.getItem(id).fetch()
     const viewer_type = item?.viewer_type
     if (!viewer_type) {
-      throw new Error("Item not found or not loaded: " + id)
+      throw new Error(`Item not found or not loaded: ${id}`)
     }
 
     if (viewer_type === "mesh") {
       return meshStyleStore.applyMeshStyle(id)
-    } else if (viewer_type === "model") {
+    }
+    if (viewer_type === "model") {
       return modelStyleStore.applyModelStyle(id)
-    } else {
-      throw new Error("Unknown viewer_type: " + viewer_type)
     }
+    throw new Error(`Unknown viewer_type: ${viewer_type}`)
   }
 
-  const exportStores = () => {
+  function exportStores() {
     return { styles: dataStyleState.styles }
   }
 
-  const importStores = (snapshot) => {
+  function importStores(snapshot) {
     const stylesSnapshot = snapshot.styles || {}
     for (const id of Object.keys(dataStyleState.styles)) {
       delete dataStyleState.styles[id]
@@ -59,7 +60,7 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
     }
   }
 
-  const applyAllStylesFromState = () => {
+  function applyAllStylesFromState() {
     const ids = Object.keys(dataStyleState.styles || {})
     const promises = []
     for (const id of ids) {
diff --git a/app/stores/feedback.js b/app/stores/feedback.js
index 3f7693bf..9baf3e5a 100644
--- a/app/stores/feedback.js
+++ b/app/stores/feedback.js
@@ -1,10 +1,14 @@
 import { v4 as uuidv4 } from "uuid"
 
+const MILLISECONDS_IN_SECOND = 1000
+const DEFAULT_FEEDBACKS_TIMEOUT_SECONDS = 10
+
 export const useFeedbackStore = defineStore("feedback", {
   state: () => ({
     feedbacks: [],
     server_error: false,
-    feedbacks_timeout_miliseconds: 10 * 1000,
+    feedbacks_timeout_miliseconds:
+      DEFAULT_FEEDBACKS_TIMEOUT_SECONDS * MILLISECONDS_IN_SECOND,
   }),
   actions: {
     async add_error(code, route, name, description) {
diff --git a/app/stores/geode.js b/app/stores/geode.js
index 1d1a975c..daa5c70e 100644
--- a/app/stores/geode.js
+++ b/app/stores/geode.js
@@ -1,9 +1,12 @@
-import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import Status from "@ogw_front/utils/status"
-import { appMode } from "@ogw_front/utils/app_mode"
 import { api_fetch } from "../../internal/utils/api_fetch"
-import { useInfraStore } from "@ogw_front/stores/infra"
+import { appMode } from "@ogw_front/utils/app_mode"
+import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import { useFeedbackStore } from "@ogw_front/stores/feedback"
+import { useInfraStore } from "@ogw_front/stores/infra"
+
+const MILLISECONDS_IN_SECOND = 1000
+const DEFAULT_PING_INTERVAL_SECONDS = 10
 
 export const useGeodeStore = defineStore("geode", {
   state: () => ({
@@ -13,17 +16,17 @@ export const useGeodeStore = defineStore("geode", {
   }),
   getters: {
     protocol() {
-      if (useInfraStore().app_mode == appMode.CLOUD) {
+      if (useInfraStore().app_mode === appMode.CLOUD) {
         return "https"
       }
       return "http"
     },
     port() {
-      if (useInfraStore().app_mode == appMode.CLOUD) {
+      if (useInfraStore().app_mode === appMode.CLOUD) {
         return "443"
       }
-      const GEODE_PORT = useRuntimeConfig().public.GEODE_PORT
-      if (GEODE_PORT != null && GEODE_PORT !== "") {
+      const { GEODE_PORT } = useRuntimeConfig().public
+      if (GEODE_PORT !== null && GEODE_PORT !== "") {
         return GEODE_PORT
       }
       return this.default_local_port
@@ -31,8 +34,8 @@ export const useGeodeStore = defineStore("geode", {
     base_url() {
       const infraStore = useInfraStore()
       let geode_url = `${this.protocol}://${infraStore.domain_name}:${this.port}`
-      if (infraStore.app_mode == appMode.CLOUD) {
-        if (infraStore.ID == "") {
+      if (infraStore.app_mode === appMode.CLOUD) {
+        if (infraStore.ID === "") {
           throw new Error("ID must not be empty in cloud mode")
         }
         geode_url += `/${infraStore.ID}/geode`
@@ -48,7 +51,7 @@ export const useGeodeStore = defineStore("geode", {
       this.ping()
       setInterval(() => {
         this.ping()
-      }, 10 * 1000)
+      }, DEFAULT_PING_INTERVAL_SECONDS * MILLISECONDS_IN_SECOND)
     },
     ping() {
       const geodeStore = this
@@ -73,10 +76,10 @@ export const useGeodeStore = defineStore("geode", {
       )
     },
     start_request() {
-      this.request_counter++
+      this.request_counter += 1
     },
     stop_request() {
-      this.request_counter--
+      this.request_counter -= 1
     },
     launch() {
       console.log("[GEODE] Launching geode microservice...")
diff --git a/app/stores/hybrid_viewer.js b/app/stores/hybrid_viewer.js
index b4872b6b..bd2385d2 100644
--- a/app/stores/hybrid_viewer.js
+++ b/app/stores/hybrid_viewer.js
@@ -1,13 +1,29 @@
+// oxlint-disable-next-line import/no-unassigned-import
 import "@kitware/vtk.js/Rendering/Profiles/Geometry"
-import vtkGenericRenderWindow from "@kitware/vtk.js/Rendering/Misc/GenericRenderWindow"
-import vtkXMLPolyDataReader from "@kitware/vtk.js/IO/XML/XMLPolyDataReader"
-import vtkMapper from "@kitware/vtk.js/Rendering/Core/Mapper"
-import vtkActor from "@kitware/vtk.js/Rendering/Core/Actor"
+import { newInstance as vtkActor } from "@kitware/vtk.js/Rendering/Core/Actor"
+import { newInstance as vtkGenericRenderWindow } from "@kitware/vtk.js/Rendering/Misc/GenericRenderWindow"
+import { newInstance as vtkMapper } from "@kitware/vtk.js/Rendering/Core/Mapper"
+import { newInstance as vtkXMLPolyDataReader } from "@kitware/vtk.js/IO/XML/XMLPolyDataReader"
 
-import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 import Status from "@ogw_front/utils/status"
-import { useViewerStore } from "@ogw_front/stores/viewer"
 import { useDataStore } from "@ogw_front/stores/data"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
+
+const RGB_MAX = 255
+const BACKGROUND_GREY_VALUE = 180
+const ACTOR_DARK_VALUE = 20
+const BACKGROUND_COLOR = [
+  BACKGROUND_GREY_VALUE / RGB_MAX,
+  BACKGROUND_GREY_VALUE / RGB_MAX,
+  BACKGROUND_GREY_VALUE / RGB_MAX,
+]
+const ACTOR_COLOR = [
+  ACTOR_DARK_VALUE / RGB_MAX,
+  ACTOR_DARK_VALUE / RGB_MAX,
+  ACTOR_DARK_VALUE / RGB_MAX,
+]
+const WHEEL_TIME_OUT_MS = 600
 
 export const useHybridViewerStore = defineStore("hybridViewer", () => {
   const viewerStore = useViewerStore()
@@ -17,15 +33,15 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
   const camera_options = reactive({})
   const genericRenderWindow = reactive({})
   const is_moving = ref(false)
-  const zScale = ref(1.0)
-  let viewStream
+  const zScale = ref(1)
+  let viewStream = null
   let gridActor = null
 
   async function initHybridViewer() {
     if (status.value !== Status.NOT_CREATED) return
     status.value = Status.CREATING
-    genericRenderWindow.value = vtkGenericRenderWindow.newInstance({
-      background: [180 / 255, 180 / 255, 180 / 255],
+    genericRenderWindow.value = vtkGenericRenderWindow({
+      background: BACKGROUND_COLOR,
       listenWindowResize: false,
     })
 
@@ -37,12 +53,12 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
 
     await viewerStore.ws_connect()
     viewStream = viewerStore.client.getImageStream().createViewStream("-1")
-    viewStream.onImageReady((e) => {
+    viewStream.onImageReady((event) => {
       if (is_moving.value) return
       const webGLRenderWindow =
         genericRenderWindow.value.getApiSpecificRenderWindow()
       const imageStyle = webGLRenderWindow.getReferenceByName("bgImage").style
-      webGLRenderWindow.setBackgroundImage(e.image)
+      webGLRenderWindow.setBackgroundImage(event.image)
       imageStyle.opacity = 1
     })
 
@@ -53,18 +69,19 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     if (!genericRenderWindow.value) {
       return
     }
-    const value = await dataStore.getItem(id).fetch()
+    const item = dataStore.getItem(id)
+    const value = await item.fetch()
     console.log("hybridViewerStore.addItem", { value })
-    const reader = vtkXMLPolyDataReader.newInstance()
+    const reader = vtkXMLPolyDataReader()
     const textEncoder = new TextEncoder()
     await reader.parseAsArrayBuffer(
       textEncoder.encode(value.binary_light_viewable),
     )
     const polydata = reader.getOutputData(0)
-    const mapper = vtkMapper.newInstance()
+    const mapper = vtkMapper()
     mapper.setInputData(polydata)
-    const actor = vtkActor.newInstance()
-    actor.getProperty().setColor(20 / 255, 20 / 255, 20 / 255)
+    const actor = vtkActor()
+    actor.getProperty().setColor(ACTOR_COLOR)
     actor.setMapper(mapper)
     const renderer = genericRenderWindow.value.getRenderer()
     const renderWindow = genericRenderWindow.value.getRenderWindow()
@@ -91,19 +108,19 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     zScale.value = z_scale
     const renderer = genericRenderWindow.value.getRenderer()
     const actors = renderer.getActors()
-    actors.forEach((actor) => {
+    for (const actor of actors) {
       if (actor !== gridActor) {
         const scale = actor.getScale()
         actor.setScale(scale[0], scale[1], z_scale)
       }
-    })
+    }
     renderer.resetCamera()
     genericRenderWindow.value.getRenderWindow().render()
     const schema = viewer_schemas?.opengeodeweb_viewer?.viewer?.set_z_scaling
     if (!schema) return
     const viewerStore = useViewerStore()
     await viewerStore.request(schema, {
-      z_scale: z_scale,
+      z_scale,
     })
     remoteRender()
   }
@@ -114,11 +131,11 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     const camera = renderer.getActiveCamera()
     const params = {
       camera_options: {
-        focal_point: camera.getFocalPoint(),
-        view_up: camera.getViewUp(),
-        position: camera.getPosition(),
+        focal_point: [...camera.getFocalPoint()],
+        view_up: [...camera.getViewUp()],
+        position: [...camera.getPosition()],
         view_angle: camera.getViewAngle(),
-        clipping_range: camera.getClippingRange(),
+        clipping_range: [...camera.getClippingRange()],
         distance: camera.getDistance(),
       },
     }
@@ -130,7 +147,9 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
         response_function: () => {
           remoteRender()
           for (const key in params.camera_options) {
-            camera_options[key] = params.camera_options[key]
+            if (Object.hasOwn(params.camera_options, key)) {
+              camera_options[key] = params.camera_options[key]
+            }
           }
         },
       },
@@ -139,7 +158,7 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
 
   function remoteRender() {
     const viewerStore = useViewerStore()
-    viewerStore.request(viewer_schemas.opengeodeweb_viewer.viewer.render)
+    return viewerStore.request(viewer_schemas.opengeodeweb_viewer.viewer.render)
   }
 
   function setContainer(container) {
@@ -157,7 +176,7 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
       target: container,
       onPressed: (event) => {
         console.log("onPressed")
-        if (event.button == 0) {
+        if (event.button === 0) {
           is_moving.value = true
           event.stopPropagation()
           imageStyle.opacity = 0
@@ -181,7 +200,7 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
       wheelEventEndTimeout = setTimeout(() => {
         is_moving.value = false
         syncRemoteCamera()
-      }, 600)
+      }, WHEEL_TIME_OUT_MS)
     })
   }
 
@@ -205,7 +224,7 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     remoteRender()
   }
 
-  const exportStores = () => {
+  function exportStores() {
     const renderer = genericRenderWindow.value.getRenderer()
     const camera = renderer.getActiveCamera()
     const cameraSnapshot = camera
@@ -221,14 +240,14 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     return { zScale: zScale.value, camera_options: cameraSnapshot }
   }
 
-  const importStores = (snapshot) => {
+  async function importStores(snapshot) {
     if (!snapshot) {
       console.warn("importStores called with undefined snapshot")
       return
     }
     const z_scale = snapshot.zScale
 
-    const applyCamera = () => {
+    function applyCamera() {
       const { camera_options } = snapshot
       if (!camera_options) {
         return
@@ -247,11 +266,11 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
 
       const payload = {
         camera_options: {
-          focal_point: camera_options.focal_point,
-          view_up: camera_options.view_up,
-          position: camera_options.position,
+          focal_point: [...camera_options.focal_point],
+          view_up: [...camera_options.view_up],
+          position: [...camera_options.position],
           view_angle: camera_options.view_angle,
-          clipping_range: camera_options.clipping_range,
+          clipping_range: [...camera_options.clipping_range],
         },
       }
       const viewerStore = useViewerStore()
@@ -268,12 +287,13 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     }
 
     if (typeof z_scale === "number") {
-      return setZScaling(z_scale).then(() => applyCamera())
+      await setZScaling(z_scale)
+      return await applyCamera()
     }
-    return applyCamera()
+    return await applyCamera()
   }
 
-  const clear = () => {
+  function clear() {
     const renderer = genericRenderWindow.value.getRenderer()
     const actors = renderer.getActors()
     for (const actor of actors) {
diff --git a/app/stores/infra.js b/app/stores/infra.js
index 138867e1..09354457 100644
--- a/app/stores/infra.js
+++ b/app/stores/infra.js
@@ -1,5 +1,5 @@
-import Status from "@ogw_front/utils/status"
 import { appMode, getAppMode } from "@ogw_front/utils/app_mode"
+import Status from "@ogw_front/utils/status"
 import { useLambdaStore } from "@ogw_front/stores/lambda"
 
 export const useInfraStore = defineStore("infra", {
@@ -12,7 +12,7 @@ export const useInfraStore = defineStore("infra", {
   }),
   getters: {
     domain_name() {
-      if (this.app_mode == appMode.CLOUD) {
+      if (this.app_mode === appMode.CLOUD) {
         return useRuntimeConfig().public.API_URL
       }
       return "localhost"
@@ -46,12 +46,12 @@ export const useInfraStore = defineStore("infra", {
 
       if (this.status === Status.CREATED) return
 
-      return navigator.locks.request("infra.create_backend", async (lock) => {
+      return navigator.locks.request("infra.create_backend", async () => {
         this.status = Status.CREATING
         if (this.status === Status.CREATED) return
         console.log("[INFRA] Lock granted for create_backend")
 
-        if (this.app_mode == appMode.DESKTOP) {
+        if (this.app_mode === appMode.DESKTOP) {
           console.log("[INFRA] DESKTOP mode - Launching microservices...")
           const microservices_with_launch = this.microservices.filter(
             (store) => store.launch,
@@ -62,10 +62,10 @@ export const useInfraStore = defineStore("infra", {
           )
           const ports = await Promise.all(port_promises)
 
-          microservices_with_launch.forEach((store, index) => {
+          for (const [index, store] of microservices_with_launch.entries()) {
             store.$patch({ default_local_port: ports[index] })
-          })
-        } else if (this.app_mode == appMode.CLOUD) {
+          }
+        } else if (this.app_mode === appMode.CLOUD) {
           console.log("[INFRA] CLOUD mode - Launching lambda...")
           const lambdaStore = useLambdaStore()
           this.ID = await lambdaStore.launch()
@@ -84,15 +84,13 @@ export const useInfraStore = defineStore("infra", {
         this.microservices.map((store) => store.$id),
       )
 
-      const connection_promises = this.microservices.map((store) => {
-        return store.connect().then(() => {
+      await Promise.all(
+        this.microservices.map(async (store) => {
+          await store.connect()
           console.log("[INFRA] Microservice connected:", store.$id)
-        })
-      })
-
-      await Promise.all(connection_promises)
+        }),
+      )
       console.log("[INFRA] All microservices connected")
-      return
     },
   },
   share: {
diff --git a/app/stores/lambda.js b/app/stores/lambda.js
index 3064c1cd..1bcb07cd 100644
--- a/app/stores/lambda.js
+++ b/app/stores/lambda.js
@@ -15,15 +15,7 @@ export const useLambdaStore = defineStore("lambda", {
     base_url() {
       const public_runtime_config = useRuntimeConfig().public
       const domain_name = public_runtime_config.API_URL
-      const url =
-        this.protocol +
-        "://" +
-        domain_name +
-        ":" +
-        this.port +
-        public_runtime_config.SITE_BRANCH +
-        public_runtime_config.PROJECT +
-        "/createbackend"
+      const url = `${this.protocol}://${domain_name}:${this.port}${public_runtime_config.SITE_BRANCH}${public_runtime_config.PROJECT}/createbackend`
       return url
     },
     is_busy() {
diff --git a/app/stores/menu.js b/app/stores/menu.js
index a74e13ef..fd0c00fd 100644
--- a/app/stores/menu.js
+++ b/app/stores/menu.js
@@ -2,39 +2,39 @@
 import PointSetPointsOptions from "@ogw_front/components/Viewer/PointSet/SpecificPointsOptions"
 
 // EdgedCurve components
-import EdgedCurvePointsOptions from "@ogw_front/components/Viewer/EdgedCurve/PointsOptions"
 import EdgedCurveEdgesOptions from "@ogw_front/components/Viewer/EdgedCurve/SpecificEdgesOptions"
+import EdgedCurvePointsOptions from "@ogw_front/components/Viewer/EdgedCurve/PointsOptions"
 
 // PolygonalSurface components
-import PolygonalSurfacePointsOptions from "@ogw_front/components/Viewer/PolygonalSurface/PointsOptions"
 import PolygonalSurfaceEdgesOptions from "@ogw_front/components/Viewer/PolygonalSurface/EdgesOptions"
+import PolygonalSurfacePointsOptions from "@ogw_front/components/Viewer/PolygonalSurface/PointsOptions"
 import PolygonalSurfacePolygonsOptions from "@ogw_front/components/Viewer/PolygonalSurface/SpecificPolygonsOptions"
 
 // TriangulatedSurface components
-import TriangulatedSurfacePointsOptions from "@ogw_front/components/Viewer/TriangulatedSurface/PointsOptions"
 import TriangulatedSurfaceEdgesOptions from "@ogw_front/components/Viewer/TriangulatedSurface/EdgesOptions"
+import TriangulatedSurfacePointsOptions from "@ogw_front/components/Viewer/TriangulatedSurface/PointsOptions"
 import TriangulatedSurfaceTrianglesOptions from "@ogw_front/components/Viewer/TriangulatedSurface/TrianglesOptions"
 
 // Grid 2D components
-import Grid2DPointsOptions from "@ogw_front/components/Viewer/Grid/2D/PointsOptions"
-import Grid2DEdgesOptions from "@ogw_front/components/Viewer/Grid/2D/EdgesOptions"
 import Grid2DCellsOptions from "@ogw_front/components/Viewer/Grid/2D/CellsOptions"
+import Grid2DEdgesOptions from "@ogw_front/components/Viewer/Grid/2D/EdgesOptions"
+import Grid2DPointsOptions from "@ogw_front/components/Viewer/Grid/2D/PointsOptions"
 
 // Grid 3D components
-import Grid3DPointsOptions from "@ogw_front/components/Viewer/Grid/3D/PointsOptions"
 import Grid3DEdgesOptions from "@ogw_front/components/Viewer/Grid/3D/EdgesOptions"
+import Grid3DPointsOptions from "@ogw_front/components/Viewer/Grid/3D/PointsOptions"
 // import Grid3DFacetsOptions from "@ogw_front/components/Viewer/Grid/3D/FacetsOptions"
 import Grid3DCellsOptions from "@ogw_front/components/Viewer/Grid/3D/CellsOptions"
 
 // Solid components
-import SolidPointsOptions from "@ogw_front/components/Viewer/Solid/PointsOptions"
 import SolidEdgesOptions from "@ogw_front/components/Viewer/Solid/EdgesOptions"
+import SolidPointsOptions from "@ogw_front/components/Viewer/Solid/PointsOptions"
 import SolidPolygonsOptions from "@ogw_front/components/Viewer/Solid/PolygonsOptions"
 import SolidPolyhedraOptions from "@ogw_front/components/Viewer/Solid/SpecificPolyhedraOptions"
 
 // TetrahedralSolid components
-import TetrahedralSolidTrianglesOptions from "@ogw_front/components/Viewer/TetrahedralSolid/TrianglesOptions"
 import TetrahedralSolidTetrahedraOptions from "@ogw_front/components/Viewer/TetrahedralSolid/TetrahedraOptions"
+import TetrahedralSolidTrianglesOptions from "@ogw_front/components/Viewer/TetrahedralSolid/TrianglesOptions"
 
 // Model components
 import ModelEdgesOptions from "@ogw_front/components/Viewer/Generic/Model/EdgesOptions"
diff --git a/app/stores/treeview.js b/app/stores/treeview.js
index d98f87dd..ad1f3864 100644
--- a/app/stores/treeview.js
+++ b/app/stores/treeview.js
@@ -1,9 +1,11 @@
 export const useTreeviewStore = defineStore("treeview", () => {
+  const PANEL_WIDTH = 300
+
   const items = ref([])
   const selection = ref([])
   const components_selection = ref([])
   const isAdditionnalTreeDisplayed = ref(false)
-  const panelWidth = ref(300)
+  const panelWidth = ref(PANEL_WIDTH)
   const model_id = ref("")
   const isTreeCollection = ref(false)
   const selectedTree = ref(null)
@@ -14,11 +16,11 @@ export const useTreeviewStore = defineStore("treeview", () => {
   function addItem(geode_object_type, name, id, viewer_type) {
     const child = { title: name, id, viewer_type }
 
-    for (let i = 0; i < items.value.length; i++) {
+    for (let i = 0; i < items.value.length; i += 1) {
       if (items.value[i].title === geode_object_type) {
         items.value[i].children.push(child)
-        items.value[i].children.sort((a, b) =>
-          a.title.localeCompare(b.title, undefined, {
+        items.value[i].children.sort((element1, element2) =>
+          element1.title.localeCompare(element2.title, undefined, {
             numeric: true,
             sensitivity: "base",
           }),
@@ -28,8 +30,8 @@ export const useTreeviewStore = defineStore("treeview", () => {
       }
     }
     items.value.push({ title: geode_object_type, children: [child] })
-    items.value.sort((a, b) =>
-      a.title.localeCompare(b.title, undefined, {
+    items.value.sort((element1, element2) =>
+      element1.title.localeCompare(element2.title, undefined, {
         numeric: true,
         sensitivity: "base",
       }),
@@ -59,7 +61,7 @@ export const useTreeviewStore = defineStore("treeview", () => {
   }
 
   function exportStores() {
-    const selectionIds = selection.value.map((c) => c.id)
+    const selectionIds = selection.value.map((store) => store.id)
     return {
       isAdditionnalTreeDisplayed: isAdditionnalTreeDisplayed.value,
       panelWidth: panelWidth.value,
@@ -73,14 +75,14 @@ export const useTreeviewStore = defineStore("treeview", () => {
   async function importStores(snapshot) {
     isAdditionnalTreeDisplayed.value =
       snapshot?.isAdditionnalTreeDisplayed || false
-    panelWidth.value = snapshot?.panelWidth || 300
+    panelWidth.value = snapshot?.panelWidth || PANEL_WIDTH
     model_id.value = snapshot?.model_id || ""
     isTreeCollection.value = snapshot?.isTreeCollection || false
     selectedTree.value = snapshot?.selectedTree || null
 
     pendingSelectionIds.value =
       snapshot?.selectionIds ||
-      (snapshot?.selection || []).map((c) => c.id) ||
+      (snapshot?.selection || []).map((store) => store.id) ||
       []
   }
 
@@ -107,7 +109,7 @@ export const useTreeviewStore = defineStore("treeview", () => {
   }
 
   function removeItem(id) {
-    for (let i = 0; i < items.value.length; i++) {
+    for (let i = 0; i < items.value.length; i += 1) {
       const group = items.value[i]
       const childIndex = group.children.findIndex((child) => child.id === id)
 
@@ -130,7 +132,7 @@ export const useTreeviewStore = defineStore("treeview", () => {
     }
   }
 
-  const clear = () => {
+  function clear() {
     items.value = []
     selection.value = []
     components_selection.value = []
diff --git a/app/stores/viewer.js b/app/stores/viewer.js
index 2c614afe..b55172f6 100644
--- a/app/stores/viewer.js
+++ b/app/stores/viewer.js
@@ -1,13 +1,26 @@
+import vtkWSLinkClient, {
+  newInstance,
+} from "@kitware/vtk.js/IO/Core/WSLinkClient"
+// oxlint-disable-next-line id-length
 import _ from "lodash"
-import vtkWSLinkClient from "@kitware/vtk.js/IO/Core/WSLinkClient"
+// oxlint-disable-next-line no-unassigned-import
 import "@kitware/vtk.js/Rendering/OpenGL/Profiles/Geometry"
-import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 import Status from "@ogw_front/utils/status"
 import { appMode } from "@ogw_front/utils/app_mode"
-import { viewer_call } from "../../internal/utils/viewer_call"
+import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 import { useInfraStore } from "@ogw_front/stores/infra"
+import { viewer_call } from "../../internal/utils/viewer_call"
+
+const MS_PER_SECOND = 1000
+const SECONDS_PER_REQUEST = 10
+const request_timeout = MS_PER_SECOND * SECONDS_PER_REQUEST
 
-const request_timeout = 10 * 1000
+async function launch() {
+  console.log("[VIEWER] Launching viewer microservice...")
+  const port_value = await window.electronAPI.run_viewer()
+  console.log("[VIEWER] Viewer launched on port:", port_value)
+  return port_value
+}
 
 export const useViewerStore = defineStore(
   "viewer",
@@ -24,19 +37,22 @@ export const useViewerStore = defineStore(
     const buzy = ref(0)
 
     const protocol = computed(() => {
-      if (useInfraStore().app_mode == appMode.CLOUD) {
+      if (infraStore.app_mode === appMode.CLOUD) {
         return "wss"
-      } else {
-        return "ws"
       }
+      return "ws"
     })
 
     const port = computed(() => {
-      if (useInfraStore().app_mode == appMode.CLOUD) {
+      if (infraStore.app_mode === appMode.CLOUD) {
         return "443"
       }
-      const VIEWER_PORT = useRuntimeConfig().public.VIEWER_PORT
-      if (VIEWER_PORT != null && VIEWER_PORT !== "") {
+      const { VIEWER_PORT } = useRuntimeConfig().public
+      if (
+        VIEWER_PORT !== undefined &&
+        VIEWER_PORT !== null &&
+        VIEWER_PORT !== ""
+      ) {
         return VIEWER_PORT
       }
       return default_local_port.value
@@ -44,8 +60,8 @@ export const useViewerStore = defineStore(
 
     const base_url = computed(() => {
       let viewer_url = `${protocol.value}://${infraStore.domain_name}:${port.value}`
-      if (infraStore.app_mode == appMode.CLOUD) {
-        if (infraStore.ID == "") {
+      if (infraStore.app_mode === appMode.CLOUD) {
+        if (infraStore.ID === "") {
           throw new Error("ID must not be empty in cloud mode")
         }
         viewer_url += `/${infraStore.ID}/viewer`
@@ -54,16 +70,17 @@ export const useViewerStore = defineStore(
       return viewer_url
     })
 
-    const is_busy = computed(() => {
-      return request_counter.value > 0
-    })
+    const is_busy = computed(() => request_counter.value > 0)
 
     function toggle_picking_mode(value) {
       picking_mode.value = value
     }
 
     async function set_picked_point(x, y) {
-      const response = await get_point_position({ x, y })
+      const response = await request(
+        schemas.opengeodeweb_viewer.generic.get_point_position,
+        { x, y },
+      )
       const { x: world_x, y: world_y } = response
       picked_point.value.x = world_x
       picked_point.value.y = world_y
@@ -78,7 +95,8 @@ export const useViewerStore = defineStore(
         try {
           console.log("VIEWER LOCK GRANTED !", lock)
           status.value = Status.CONNECTING
-          const SmartConnect = await import("wslink/src/SmartConnect")
+          const { default: SmartConnect } =
+            await import("wslink/src/SmartConnect")
           vtkWSLinkClient.setSmartConnectClass(SmartConnect)
 
           const config_obj = { application: "Viewer" }
@@ -90,7 +108,7 @@ export const useViewerStore = defineStore(
           }
           let clientToConnect = client.value
           if (_.isEmpty(clientToConnect)) {
-            clientToConnect = vtkWSLinkClient.newInstance()
+            clientToConnect = newInstance()
           }
 
           // Connect to busy store
@@ -101,17 +119,13 @@ export const useViewerStore = defineStore(
 
           // Error
           clientToConnect.onConnectionError((httpReq) => {
-            const message =
-              (httpReq && httpReq.response && httpReq.response.error) ||
-              `Connection error`
+            const message = httpReq?.response?.error || `Connection error`
             console.error(message)
           })
 
           // Close
           clientToConnect.onConnectionClose((httpReq) => {
-            const message =
-              (httpReq && httpReq.response && httpReq.response.error) ||
-              `Connection close`
+            const message = httpReq?.response?.error || `Connection close`
             console.error(message)
           })
 
@@ -120,7 +134,7 @@ export const useViewerStore = defineStore(
             await import("@kitware/vtk.js/Rendering/Misc/RemoteView")
           client.value = await clientToConnect.connect(config_obj)
           connectImageStream(client.value.getConnection().getSession())
-          client.value.endBusy()
+          clientToConnect.endBusy()
           await request(
             schemas.opengeodeweb_viewer.viewer.reset_visualization,
             {},
@@ -137,18 +151,11 @@ export const useViewerStore = defineStore(
     }
 
     function start_request() {
-      request_counter.value++
+      request_counter.value += 1
     }
 
     function stop_request() {
-      request_counter.value--
-    }
-
-    async function launch() {
-      console.log("[VIEWER] Launching viewer microservice...")
-      const port = await window.electronAPI.run_viewer()
-      console.log("[VIEWER] Viewer launched on port:", port)
-      return port
+      request_counter.value -= 1
     }
 
     async function connect() {
diff --git a/app/utils/app_mode.js b/app/utils/app_mode.js
index 7fd563b3..6c93b574 100644
--- a/app/utils/app_mode.js
+++ b/app/utils/app_mode.js
@@ -1,12 +1,12 @@
 import isElectron from "is-electron"
 
-export const appMode = {
+const appMode = {
   DESKTOP: "DESKTOP",
   BROWSER: "BROWSER",
   CLOUD: "CLOUD",
 }
 
-export function getAppMode() {
+function getAppMode() {
   if (isElectron()) {
     return appMode.DESKTOP
   }
@@ -15,4 +15,8 @@ export function getAppMode() {
   }
   return appMode.CLOUD
 }
-export default { appMode, getAppMode }
+
+const app_mode_utils = { appMode, getAppMode }
+
+export { appMode, getAppMode }
+export default app_mode_utils
diff --git a/app/utils/default_styles.js b/app/utils/default_styles.js
index 09942b26..3ae3456a 100644
--- a/app/utils/default_styles.js
+++ b/app/utils/default_styles.js
@@ -22,11 +22,11 @@ const blocks_defaultVisibility = true
 const blocks_defaultColor = { r: 255, g: 255, b: 255 }
 
 // Mesh functions
-const meshPointsDefaultStyle = (
+function meshPointsDefaultStyle(
   visibility = points_defaultVisibility,
   size = points_defaultSize,
   color = points_defaultColor,
-) => {
+) {
   return {
     visibility,
     coloring: {
@@ -38,11 +38,11 @@ const meshPointsDefaultStyle = (
   }
 }
 
-const meshEdgesDefaultStyle = (
+function meshEdgesDefaultStyle(
   visibility = edges_defaultVisibility,
   width = edges_defaultWidth,
   color = edges_defaultColor,
-) => {
+) {
   return {
     visibility,
     coloring: {
@@ -55,10 +55,10 @@ const meshEdgesDefaultStyle = (
   }
 }
 
-const meshCellsDefaultStyle = (
+function meshCellsDefaultStyle(
   visibility = cells_defaultVisibility,
   color = cells_defaultColor,
-) => {
+) {
   return {
     visibility,
     coloring: {
@@ -71,10 +71,10 @@ const meshCellsDefaultStyle = (
   }
 }
 
-const meshPolygonsDefaultStyle = (
+function meshPolygonsDefaultStyle(
   visibility = polygons_defaultVisibility,
   color = polygons_defaultColor,
-) => {
+) {
   return {
     visibility,
     coloring: {
@@ -87,10 +87,10 @@ const meshPolygonsDefaultStyle = (
   }
 }
 
-const meshPolyhedraDefaultStyle = (
+function meshPolyhedraDefaultStyle(
   visibility = polyhedra_defaultVisibility,
   color = polyhedra_defaultColor,
-) => {
+) {
   return {
     visibility,
     coloring: {
@@ -102,14 +102,14 @@ const meshPolyhedraDefaultStyle = (
   }
 }
 
-const pointSet_defaultStyle = () => {
+function pointSet_defaultStyle() {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(),
   }
 }
 
-const edgedCurve_defaultStyle = () => {
+function edgedCurve_defaultStyle() {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(),
@@ -117,7 +117,7 @@ const edgedCurve_defaultStyle = () => {
   }
 }
 
-const grid2d_defaultStyle = () => {
+function grid2d_defaultStyle() {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(false),
@@ -126,7 +126,7 @@ const grid2d_defaultStyle = () => {
   }
 }
 
-const grid3d_defaultStyle = () => {
+function grid3d_defaultStyle() {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(false),
@@ -135,7 +135,7 @@ const grid3d_defaultStyle = () => {
     polyhedra: meshPolyhedraDefaultStyle(),
   }
 }
-const surface_defaultStyle = () => {
+function surface_defaultStyle() {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(false),
@@ -144,7 +144,7 @@ const surface_defaultStyle = () => {
   }
 }
 
-const solid_defaultStyle = () => {
+function solid_defaultStyle() {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(false),
@@ -155,41 +155,49 @@ const solid_defaultStyle = () => {
 }
 
 // Model functions
-const modelCornersDefaultStyle = (
+function modelCornersDefaultStyle(
   visibility = corners_defaultVisibility,
   color = corners_defaultColor,
-) => {
+) {
   return { visibility, color }
 }
-const modelLinesDefaultStyle = (
+
+function modelLinesDefaultStyle(
   visibility = lines_defaultVisibility,
   color = lines_defaultColor,
-) => {
+) {
   return { visibility, color }
 }
-const modelSurfacesDefaultStyle = (
+
+function modelSurfacesDefaultStyle(
   visibility = surfaces_defaultVisibility,
   color = surfaces_defaultColor,
-) => {
+) {
   return { visibility, color }
 }
-const modelBlocksDefaultStyle = (
+
+function modelBlocksDefaultStyle(
   visibility = blocks_defaultVisibility,
   color = blocks_defaultColor,
-) => {
+) {
   return { visibility, color }
 }
-const modelPointsDefaultStyle = (
+
+function modelPointsDefaultStyle(
   visibility = points_defaultVisibility,
-  size,
-) => {
+  size = points_defaultSize,
+) {
   return { visibility, size }
 }
-const modelEdgesDefaultStyle = (visibility = edges_defaultVisibility) => {
-  return { visibility }
+
+function modelEdgesDefaultStyle(
+  visibility = edges_defaultVisibility,
+  width = edges_defaultWidth,
+) {
+  return { visibility, width }
 }
 
-const brep_defaultStyle = () => {
+function brep_defaultStyle() {
   return {
     visibility: true,
     corners: modelCornersDefaultStyle(),
@@ -201,7 +209,7 @@ const brep_defaultStyle = () => {
   }
 }
 
-const crossSection_defaultStyle = () => {
+function crossSection_defaultStyle() {
   return {
     visibility: true,
     corners: modelCornersDefaultStyle(),
@@ -212,7 +220,7 @@ const crossSection_defaultStyle = () => {
   }
 }
 
-const structuralModel_defaultStyle = () => {
+function structuralModel_defaultStyle() {
   return {
     visibility: true,
     corners: modelCornersDefaultStyle(),
@@ -224,7 +232,7 @@ const structuralModel_defaultStyle = () => {
   }
 }
 
-const section_defaultStyle = () => {
+function section_defaultStyle() {
   return {
     visibility: true,
     corners: modelCornersDefaultStyle(),
@@ -235,7 +243,7 @@ const section_defaultStyle = () => {
   }
 }
 
-const implicitCrossSection_defaultStyle = () => {
+function implicitCrossSection_defaultStyle() {
   return {
     visibility: true,
     corners: modelCornersDefaultStyle(),
@@ -246,7 +254,7 @@ const implicitCrossSection_defaultStyle = () => {
   }
 }
 
-const implicitStructuralModel_defaultStyle = () => {
+function implicitStructuralModel_defaultStyle() {
   return {
     visibility: true,
     corners: modelCornersDefaultStyle(),
@@ -258,7 +266,7 @@ const implicitStructuralModel_defaultStyle = () => {
   }
 }
 
-const default_styles = () => {
+function default_styles() {
   return {
     BRep: brep_defaultStyle(),
     CrossSection: crossSection_defaultStyle(),
diff --git a/app/utils/file_import_workflow.js b/app/utils/file_import_workflow.js
index 09a64e1e..c1e52dc9 100644
--- a/app/utils/file_import_workflow.js
+++ b/app/utils/file_import_workflow.js
@@ -2,10 +2,10 @@
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 
 // Local imports
-import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
-import { useGeodeStore } from "@ogw_front/stores/geode"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
 import { useDataStore } from "@ogw_front/stores/data"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useGeodeStore } from "@ogw_front/stores/geode"
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
 import { useTreeviewStore } from "@ogw_front/stores/treeview"
 
 async function importWorkflow(files) {
@@ -73,22 +73,9 @@ async function importFile(filename, geode_object_type) {
 
 async function importWorkflowFromSnapshot(items) {
   console.log("[importWorkflowFromSnapshot] start", { count: items?.length })
-  const dataStore = useDataStore()
-  const treeviewStore = useTreeviewStore()
-  const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
 
-  const ids = []
-  for (const item of items) {
-    const id = await importItem(
-      item,
-      dataStore,
-      treeviewStore,
-      dataStyleStore,
-      hybridViewerStore,
-    )
-    ids.push(id)
-  }
+  const ids = await Promise.all(items.map((item) => importItem(item)))
   hybridViewerStore.remoteRender()
   console.log("[importWorkflowFromSnapshot] done", { ids })
   return ids
diff --git a/app/utils/local.js b/app/utils/local.js
index 54d29628..4d55602f 100644
--- a/app/utils/local.js
+++ b/app/utils/local.js
@@ -1,19 +1,23 @@
-// Node.js imports
-import fs from "fs"
-import path from "path"
-import child_process from "child_process"
-import WebSocket from "ws"
+import { on, once } from "node:events"
+import child_process from "node:child_process"
+import fs from "node:fs"
+import path from "node:path"
 
 // Third party imports
+import { WebSocket } from "ws"
+import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json" with { type: "json" }
 import { getPort } from "get-port-please"
 import isElectron from "is-electron"
 import pTimeout from "p-timeout"
-import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json" with { type: "json" }
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" }
 
+const MAX_DELETE_FOLDER_RETRIES = 5
+const DEFAULT_TIMEOUT_SECONDS = 30
+const MILLISECONDS_PER_SECOND = 1000
+
 function venv_script_path(root_path, microservice_path) {
   const venv_path = path.join(root_path, microservice_path, "venv")
-  var script_path
+  let script_path = ""
   if (process.platform === "win32") {
     script_path = path.join(venv_path, "Scripts")
   } else {
@@ -37,7 +41,7 @@ async function executable_path(microservice_path) {
 
 function executable_name(name) {
   if (process.platform === "win32") {
-    return name + ".exe"
+    return `${name}.exe`
   }
   return name
 }
@@ -65,119 +69,109 @@ function commandExistsSync(executable_name) {
   })
 }
 
+async function wait_for_ready(child, expected_response) {
+  for await (const [data] of on(child.stdout, "data")) {
+    if (data.toString().includes(expected_response)) {
+      return child
+    }
+  }
+  throw new Error("Process closed before signal")
+}
+
 async function run_script(
   executable_name,
   executable_path,
   args,
   expected_response,
-  timeout_seconds = 30,
+  timeout_seconds = DEFAULT_TIMEOUT_SECONDS,
 ) {
-  return new Promise((resolve, reject) => {
-    setTimeout(() => {
-      reject("Timed out after " + timeout_seconds + " seconds")
-    }, timeout_seconds * 1000)
+  const command = commandExistsSync(executable_name)
+    ? executable_name
+    : path.join(executable_path, executable_name)
+  console.log("run_script", command, args)
+  const child = child_process.spawn(command, args, {
+    encoding: "utf8",
+    shell: true,
+  })
 
-    const command = commandExistsSync(executable_name)
-      ? executable_name
-      : path.join(executable_path, executable_name)
-    console.log("run_script", command, args)
-    const child = child_process.spawn(command, args, {
-      encoding: "utf8",
-      shell: true,
-    })
+  child.stdout.on("data", (data) => console.log(data.toString()))
+  child.stderr.on("data", (data) => console.log(data.toString()))
 
-    // You can also use a variable to save the output for when the script closes later
-    child.stderr.setEncoding("utf8")
-    child.on("error", async (error) => {
-      const electron = await import("electron")
-      electron.dialog.showMessageBox({
-        title: "Title",
-        type: "warning",
-        message: "Error occured.\r\n" + error,
-      })
-    })
-    child.stdout.setEncoding("utf8")
-    child.stdout.on("data", (data) => {
-      //Here is the output
-      data = data.toString()
-      if (data.includes(expected_response)) {
-        resolve(child)
-      }
-      console.log(data)
+  child.on("error", async (error) => {
+    const electron = await import("electron")
+    electron.dialog.showMessageBox({
+      title: "Title",
+      type: "warning",
+      message: `Error occured.\r\n${error}`,
     })
+  })
 
-    child.stderr.on("data", (data) => {
-      console.log(data)
-    })
+  child.on("close", (code) =>
+    console.log(`Child Process exited with code ${code}`),
+  )
+  child.on("kill", () => {
+    console.log("Child Process killed")
+  })
+  child.name = command.replace(/^.*[\\/]/, "")
 
-    child.on("close", (_code) => {
-      //Here you can get the exit code of the script
-      console.log("Child Process exited with code " + _code)
-    })
-    child.on("kill", () => {
-      console.log("Child Process killed")
+  try {
+    return await pTimeout(wait_for_ready(child, expected_response), {
+      milliseconds: timeout_seconds * MILLISECONDS_PER_SECOND,
+      message: `Timed out after ${timeout_seconds} seconds`,
     })
-    child.name = command.replace(/^.*[\\/]/, "")
-    return child
-  })
+  } catch (error) {
+    child.kill()
+    throw error
+  }
 }
 
-async function run_back(
-  executable_name,
-  executable_path,
-  args = {
-    project_folder_path,
-    upload_folder_path: undefined,
-  },
-) {
-  return new Promise(async (resolve, reject) => {
-    let upload_folder_path = args.upload_folder_path
-    if (!args.upload_folder_path) {
-      upload_folder_path = path.join(args.project_folder_path, "uploads")
-    }
-    const port = await get_available_port()
-    const back_args = [
-      "--port " + port,
-      "--data_folder_path " + args.project_folder_path,
-      "--upload_folder_path " + upload_folder_path,
-      "--allowed_origin http://localhost:*",
-      "--timeout " + 0,
-    ]
-    if (process.env.NODE_ENV === "development" || !process.env.NODE_ENV) {
-      back_args.push("--debug")
-    }
-    console.log("run_back", executable_name, executable_path, back_args)
-    await run_script(
-      executable_name,
-      executable_path,
-      back_args,
-      "Serving Flask app",
-    )
-    resolve(port)
-  })
+async function run_back(executable_name, executable_path, args = {}) {
+  let { project_folder_path, upload_folder_path } = args
+  if (!project_folder_path) {
+    throw new Error("project_folder_path is required")
+  }
+  if (!upload_folder_path) {
+    upload_folder_path = path.join(project_folder_path, "uploads")
+  }
+  const port = await get_available_port()
+  const back_args = [
+    `--port ${port}`,
+    `--data_folder_path ${project_folder_path}`,
+    `--upload_folder_path ${upload_folder_path}`,
+    `--allowed_origin http://localhost:*`,
+    `--timeout ${0}`,
+  ]
+  if (process.env.NODE_ENV === "development" || !process.env.NODE_ENV) {
+    back_args.push("--debug")
+  }
+  console.log("run_back", executable_name, executable_path, back_args)
+  await run_script(
+    executable_name,
+    executable_path,
+    back_args,
+    "Serving Flask app",
+  )
+  return port
 }
 
-async function run_viewer(
-  executable_name,
-  executable_path,
-  args = { project_folder_path },
-) {
-  return new Promise(async (resolve, reject) => {
-    const port = await get_available_port()
-    const viewer_args = [
-      "--port " + port,
-      "--data_folder_path " + args.project_folder_path,
-      "--timeout " + 0,
-    ]
-    console.log("run_viewer", executable_name, executable_path, viewer_args)
-    await run_script(
-      executable_name,
-      executable_path,
-      viewer_args,
-      "Starting factory",
-    )
-    resolve(port)
-  })
+async function run_viewer(executable_name, executable_path, args = {}) {
+  if (!args.project_folder_path) {
+    throw new Error("project_folder_path is required")
+  }
+  const port = await get_available_port()
+  const viewer_args = [
+    `--port ${port}`,
+    `--data_folder_path ${args.project_folder_path}`,
+    `--timeout ${0}`,
+  ]
+  console.log("run_viewer", executable_name, executable_path, viewer_args)
+  await run_script(
+    executable_name,
+    executable_path,
+    viewer_args,
+    "Starting factory",
+  )
+  return port
 }
 
 function delete_folder_recursive(data_folder_path) {
@@ -186,60 +180,52 @@ function delete_folder_recursive(data_folder_path) {
     return
   }
   try {
-    for (const i = 0; i <= 5; i++) {
+    for (let i = 0; i <= MAX_DELETE_FOLDER_RETRIES; i += 1) {
       console.log(`Deleting folder: ${data_folder_path}`)
       fs.rmSync(data_folder_path, { recursive: true, force: true })
       console.log(`Deleted folder: ${data_folder_path}`)
       return
     }
-  } catch (err) {
-    console.error(`Error deleting folder ${data_folder_path}:`, err)
+  } catch (error) {
+    console.error(`Error deleting folder ${data_folder_path}:`, error)
   }
 }
 
 function kill_back(back_port) {
-  return pTimeout(
-    new Promise((resolve, reject) => {
-      fetch(
-        "http://localhost:" +
-          back_port +
-          "/" +
-          back_schemas.opengeodeweb_back.kill.$id,
+  async function do_kill() {
+    try {
+      await fetch(
+        `http://localhost:${back_port}/${back_schemas.opengeodeweb_back.kill.$id}`,
         {
           method: back_schemas.opengeodeweb_back.kill.methods[0],
         },
       )
-        .then(() => {
-          console.log("Failed to kill back")
-          reject()
-        })
-        .catch(() => {
-          console.log("Back closed")
-          resolve()
-        })
-    }),
-    {
-      milliseconds: 500,
-      message: "Failed to kill back",
-    },
-  )
+      throw new Error("Failed to kill back")
+    } catch (error) {
+      console.log("Back closed", error)
+    }
+  }
+  return pTimeout(do_kill(), {
+    milliseconds: 500,
+    message: "Failed to kill back",
+  })
 }
 
 function kill_viewer(viewer_port) {
-  return pTimeout(
-    new Promise((resolve) => {
-      const socket = new WebSocket("ws://localhost:" + viewer_port + "/ws")
-      socket.on("open", () => {
-        console.log("Connected to WebSocket server")
-        socket.send(
-          JSON.stringify({
-            id: "system:hello",
-            method: "wslink.hello",
-            args: [{ secret: "wslink-secret" }],
-          }),
-        )
-      })
-      socket.on("message", (data) => {
+  async function do_kill() {
+    const socket = new WebSocket(`ws://localhost:${viewer_port}/ws`)
+    try {
+      await once(socket, "open")
+      console.log("Connected to WebSocket server")
+      socket.send(
+        JSON.stringify({
+          id: "system:hello",
+          method: "wslink.hello",
+          args: [{ secret: "wslink-secret" }],
+        }),
+      )
+
+      for await (const [data] of on(socket, "message")) {
         const message = data.toString()
         console.log("Received from server:", message)
 
@@ -250,48 +236,89 @@ function kill_viewer(viewer_port) {
               method: viewer_schemas.opengeodeweb_viewer.kill.$id,
             }),
           )
-          resolve()
+          break
         }
-      })
-      socket.on("close", () => {
-        console.log("Disconnected from WebSocket server")
-        resolve()
-      })
-      socket.on("error", (error) => {
-        console.error("WebSocket error:", error)
-        resolve()
-      })
-    }),
-    {
-      milliseconds: 500,
-      message: "Failed to kill viewer",
-    },
-  )
+      }
+      await once(socket, "close")
+      console.log("Disconnected from WebSocket server")
+    } catch (error) {
+      console.error("WebSocket error:", error)
+    } finally {
+      if (socket.readyState === WebSocket.OPEN) {
+        socket.close()
+      }
+    }
+  }
+
+  return pTimeout(do_kill(), {
+    milliseconds: 500,
+    message: "Failed to kill viewer",
+  })
+}
+
+async function wait_nuxt(nuxt_process, back_port, viewer_port) {
+  for await (const [data] of on(nuxt_process.stdout, "data")) {
+    const output = data.toString()
+    const portMatch = output.match(
+      /Accepting connections at http:\/\/localhost:(\d+)/,
+    )
+    console.log("Nuxt:", output)
+    if (portMatch) {
+      const [, nuxt_port] = portMatch
+      process.env.NUXT_PORT = nuxt_port
+      return { geode_port: back_port, viewer_port, nuxt_port }
+    }
+  }
+  throw new Error("Nuxt process closed without accepting connections")
 }
 
 async function run_browser(
   script_name,
   microservices_options = {
-    back: { executable_name, executable_path, args: { project_folder_path } },
-    viewer: { executable_name, executable_path, args: { project_folder_path } },
+    back: {
+      executable_name: executable_name("opengeodeweb-back"),
+      executable_path: "",
+      args: { project_folder_path: "" },
+    },
+    viewer: {
+      executable_name: executable_name("opengeodeweb-viewer"),
+      executable_path: "",
+      args: { project_folder_path: "" },
+    },
   },
 ) {
-  console.log("microservices_options", microservices_options)
+  if (
+    microservices_options.back.executable_path === "" ||
+    microservices_options.back.args.project_folder_path === ""
+  ) {
+    const microservices_path = "microservices"
+    microservices_options.back.executable_path =
+      await executable_path(microservices_path)
+    microservices_options.back.args.project_folder_path = create_path(
+      path.join(process.cwd(), "data"),
+    )
+  }
+  if (
+    microservices_options.viewer.executable_path === "" ||
+    microservices_options.viewer.args.project_folder_path === ""
+  ) {
+    const microservices_path = "microservices"
+    microservices_options.viewer.executable_path =
+      await executable_path(microservices_path)
+    microservices_options.viewer.args.project_folder_path =
+      microservices_options.back.args.project_folder_path
+  }
   const back_promise = run_back(
     microservices_options.back.executable_name,
     microservices_options.back.executable_path,
-    {
-      ...microservices_options.back.args,
-    },
+    { ...microservices_options.back.args },
   )
   console.log("back_promise", back_promise)
 
   const viewer_promise = run_viewer(
     microservices_options.viewer.executable_name,
     microservices_options.viewer.executable_path,
-    {
-      ...microservices_options.viewer.args,
-    },
+    { ...microservices_options.viewer.args },
   )
   console.log("viewer_promise", viewer_promise)
 
@@ -316,22 +343,7 @@ async function run_browser(
     shell: true,
     FORCE_COLOR: true,
   })
-
-  return new Promise((resolve) => {
-    nuxt_process.stdout.on("data", function (data) {
-      const output = data.toString()
-      const portMatch = output.match(
-        /Accepting\ connections\ at\ http:\/\/localhost:(\d+)/,
-      )
-      console.log("Nuxt: ", output)
-      if (portMatch) {
-        const nuxt_port = portMatch[1]
-        process.env.NUXT_PORT = nuxt_port
-        resolve({ geode_port: back_port, viewer_port, nuxt_port })
-        return
-      }
-    })
-  })
+  return wait_nuxt(nuxt_process, back_port, viewer_port)
 }
 
 export {
diff --git a/app/utils/upload_file.js b/app/utils/upload_file.js
index 38f30bc3..456a8aed 100644
--- a/app/utils/upload_file.js
+++ b/app/utils/upload_file.js
@@ -1,5 +1,5 @@
-import { useGeodeStore } from "@ogw_front/stores/geode"
 import { useFeedbackStore } from "@ogw_front/stores/feedback"
+import { useGeodeStore } from "@ogw_front/stores/geode"
 
 export async function upload_file(
   { route, file },
@@ -18,7 +18,6 @@ export async function upload_file(
     method: "PUT",
     body: body,
   }
-
   geodeStore.start_request()
   return $fetch(route, {
     baseURL: geodeStore.base_url,
diff --git a/eslint.config.js b/eslint.config.js
index ca078555..80ded028 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,7 +1,8 @@
+import nuxt from "eslint-plugin-nuxt"
 import vue from "eslint-plugin-vue"
 import vuetify from "eslint-plugin-vuetify"
-import nuxt from "eslint-plugin-nuxt"
 
+// oxlint-disable-next-line import/no-anonymous-default-export
 export default [
   {
     files: ["**/*.{js,ts,vue}"],
diff --git a/internal/database/database.js b/internal/database/database.js
index a8666e73..df954d3b 100644
--- a/internal/database/database.js
+++ b/internal/database/database.js
@@ -1,8 +1,9 @@
-import Dexie from "dexie"
+import { Dexie } from "dexie"
+import { ExtendedDatabase } from "./extended_database"
 import { dataTable } from "./tables/data_table"
 import { modelComponentsTable } from "./tables/model_components"
 
-export class Database extends Dexie {
+class Database extends Dexie {
   constructor() {
     super("Database")
 
@@ -16,50 +17,34 @@ export class Database extends Dexie {
     const tempDb = new Database()
     await tempDb.open()
 
-    if (tempDb.tables.some((t) => t.name === tableName)) {
-      console.warn(`Table "${tableName}" already exists`)
+    if (tempDb.tables.some((table) => table.name === tableName)) {
       tempDb.close()
       return tempDb
     }
 
     const currentVersion = tempDb.verno
-
     const currentStores = {}
-    tempDb.tables.forEach((table) => {
+
+    for (const table of tempDb.tables) {
       const keyPath = table.schema.primKey.src
-      const indexes = table.schema.indexes.map((idx) => idx.src)
+      const indexes = table.schema.indexes.map((index) => index.src)
       currentStores[table.name] = [keyPath, ...indexes].join(",")
-    })
+    }
 
     tempDb.close()
 
-    class ExtendedDatabase extends Dexie {
-      constructor() {
-        super("Database")
-
-        for (let v = 1; v <= currentVersion; v++) {
-          if (v === 1) {
-            this.version(1).stores({
-              [dataTable.name]: dataTable.schema,
-              [modelComponentsTable.name]: modelComponentsTable.schema,
-            })
-          } else {
-            this.version(v).stores(currentStores)
-          }
-        }
-
-        this.version(currentVersion + 1).stores({
-          ...currentStores,
-          [tableName]: schemaDefinition,
-        })
-      }
-    }
-
-    const newDb = new ExtendedDatabase()
+    const newDb = new ExtendedDatabase(
+      currentVersion,
+      currentStores,
+      tableName,
+      schemaDefinition,
+    )
     await newDb.open()
 
     return newDb
   }
 }
 
-export const database = new Database()
+const database = new Database()
+
+export { Database, database }
diff --git a/internal/database/extended_database.js b/internal/database/extended_database.js
new file mode 100644
index 00000000..19c50514
--- /dev/null
+++ b/internal/database/extended_database.js
@@ -0,0 +1,25 @@
+import { Dexie } from "dexie"
+import { dataTable } from "./tables/data_table"
+import { modelComponentsTable } from "./tables/model_components"
+
+export class ExtendedDatabase extends Dexie {
+  constructor(currentVersion, currentStores, tableName, schemaDefinition) {
+    super("Database")
+
+    for (let version = 1; version <= currentVersion; version += 1) {
+      if (version === 1) {
+        this.version(1).stores({
+          [dataTable.name]: dataTable.schema,
+          [modelComponentsTable.name]: modelComponentsTable.schema,
+        })
+      } else {
+        this.version(version).stores(currentStores)
+      }
+    }
+
+    this.version(currentVersion + 1).stores({
+      ...currentStores,
+      [tableName]: schemaDefinition,
+    })
+  }
+}
diff --git a/internal/stores/data_style_state.js b/internal/stores/data_style_state.js
index 3b5dd49d..3cf21ad4 100644
--- a/internal/stores/data_style_state.js
+++ b/internal/stores/data_style_state.js
@@ -1,4 +1,4 @@
-import { reactive, computed } from "vue"
+import { computed, reactive } from "vue"
 
 export const useDataStyleStateStore = defineStore("dataStyleState", () => {
   const styles = reactive({})
diff --git a/internal/stores/mesh/edges.js b/internal/stores/mesh/edges.js
index db16c41d..43a2d8df 100644
--- a/internal/stores/mesh/edges.js
+++ b/internal/stores/mesh/edges.js
@@ -40,7 +40,7 @@ export function useMeshEdgesStyle() {
     return meshEdgesStyle(id).coloring.active
   }
   function setMeshEdgesActiveColoring(id, type) {
-    const coloring = meshEdgesStyle(id).coloring
+    const { coloring } = meshEdgesStyle(id)
     coloring.active = type
     console.log(
       setMeshEdgesActiveColoring.name,
@@ -60,7 +60,7 @@ export function useMeshEdgesStyle() {
       }
       return setMeshEdgesEdgeAttribute(id, coloring.edge)
     } else {
-      throw new Error("Unknown mesh edges coloring type: " + type)
+      throw new Error(`Unknown mesh edges coloring type: ${type}`)
     }
   }
 
@@ -68,13 +68,13 @@ export function useMeshEdgesStyle() {
     return meshEdgesStyle(id).coloring.color
   }
   function setMeshEdgesColor(id, color) {
-    const coloring_style = meshEdgesStyle(id).coloring
+    const { coloring } = meshEdgesStyle(id)
     return viewerStore.request(
       mesh_edges_schemas.color,
       { id, color },
       {
         response_function: () => {
-          coloring_style.color = color
+          coloring.color = color
           console.log(
             setMeshEdgesColor.name,
             { id },
diff --git a/internal/stores/mesh/index.js b/internal/stores/mesh/index.js
index b38d710c..1fb492ba 100644
--- a/internal/stores/mesh/index.js
+++ b/internal/stores/mesh/index.js
@@ -2,14 +2,14 @@
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
 // Local imports
-import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
 import { useDataStyleStateStore } from "../data_style_state"
-import { useViewerStore } from "@ogw_front/stores/viewer"
-import { useMeshPointsStyle } from "./points"
-import { useMeshEdgesStyle } from "./edges"
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
 import { useMeshCellsStyle } from "./cells"
+import { useMeshEdgesStyle } from "./edges"
+import { useMeshPointsStyle } from "./points"
 import { useMeshPolygonsStyle } from "./polygons"
 import { useMeshPolyhedraStyle } from "./polyhedra"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
 const mesh_schemas = viewer_schemas.opengeodeweb_viewer.mesh
@@ -58,7 +58,7 @@ export default function useMeshStyle() {
       } else if (key === "polyhedra") {
         promise_array.push(meshPolyhedraStyleStore.applyMeshPolyhedraStyle(id))
       } else {
-        throw new Error("Unknown mesh key: " + key)
+        throw new Error(`Unknown mesh key: ${key}`)
       }
     }
     return Promise.all(promise_array)
diff --git a/internal/stores/mesh/points.js b/internal/stores/mesh/points.js
index 45ccd45a..36bac26f 100644
--- a/internal/stores/mesh/points.js
+++ b/internal/stores/mesh/points.js
@@ -41,7 +41,7 @@ export function useMeshPointsStyle() {
     return meshPointsStyle(id).coloring.active
   }
   function setMeshPointsActiveColoring(id, type) {
-    const coloring = meshPointsStyle(id).coloring
+    const { coloring } = meshPointsStyle(id)
     coloring.active = type
     console.log(
       setMeshPointsActiveColoring.name,
@@ -56,7 +56,7 @@ export function useMeshPointsStyle() {
       }
       return setMeshPointsVertexAttribute(id, coloring.vertex)
     } else {
-      throw new Error("Unknown mesh points coloring type: " + type)
+      throw new Error(`Unknown mesh points coloring type: ${type}`)
     }
   }
 
@@ -64,13 +64,13 @@ export function useMeshPointsStyle() {
     return meshPointsStyle(id).coloring.color
   }
   function setMeshPointsColor(id, color) {
-    const coloring_style = meshPointsStyle(id).coloring
+    const { coloring } = meshPointsStyle(id)
     return viewerStore.request(
       mesh_points_schemas.color,
       { id, color },
       {
         response_function: () => {
-          coloring_style.color = color
+          coloring.color = color
           console.log(
             setMeshPointsColor.name,
             { id },
diff --git a/internal/stores/mesh/polygons.js b/internal/stores/mesh/polygons.js
index 524c384c..392f132b 100644
--- a/internal/stores/mesh/polygons.js
+++ b/internal/stores/mesh/polygons.js
@@ -126,7 +126,7 @@ export function useMeshPolygonsStyle() {
     return meshPolygonsStyle(id).coloring.active
   }
   function setMeshPolygonsActiveColoring(id, type) {
-    const coloring = meshPolygonsStyle(id).coloring
+    const { coloring } = meshPolygonsStyle(id)
     coloring.active = type
     console.log(
       setMeshPolygonsActiveColoring.name,
@@ -151,7 +151,7 @@ export function useMeshPolygonsStyle() {
       }
       return setMeshPolygonsPolygonAttribute(id, coloring.polygon)
     } else {
-      throw new Error("Unknown mesh polygons coloring type: " + type)
+      throw new Error(`Unknown mesh polygons coloring type: ${type}`)
     }
   }
 
diff --git a/internal/stores/mesh/polyhedra.js b/internal/stores/mesh/polyhedra.js
index 47c2520b..27f61940 100644
--- a/internal/stores/mesh/polyhedra.js
+++ b/internal/stores/mesh/polyhedra.js
@@ -40,7 +40,7 @@ export function useMeshPolyhedraStyle() {
     return meshPolyhedraStyle(id).coloring.active
   }
   function setMeshPolyhedraActiveColoring(id, type) {
-    const coloring = meshPolyhedraStyle(id).coloring
+    const { coloring } = meshPolyhedraStyle(id)
     coloring.active = type
     console.log(
       setMeshPolyhedraActiveColoring.name,
@@ -60,7 +60,7 @@ export function useMeshPolyhedraStyle() {
       }
       return setMeshPolyhedraPolyhedronAttribute(id, coloring.polyhedron)
     } else {
-      throw new Error("Unknown mesh polyhedra coloring type: " + type)
+      throw new Error(`Unknown mesh polyhedra coloring type: ${type}`)
     }
   }
 
@@ -68,7 +68,7 @@ export function useMeshPolyhedraStyle() {
     return meshPolyhedraStyle(id).coloring.color
   }
   function setMeshPolyhedraColor(id, color) {
-    const coloring = meshPolyhedraStyle(id).coloring
+    const { coloring } = meshPolyhedraStyle(id)
     return viewerStore.request(
       mesh_polyhedra_schemas.color,
       { id, color },
@@ -89,13 +89,13 @@ export function useMeshPolyhedraStyle() {
     return meshPolyhedraStyle(id).coloring.vertex
   }
   function setMeshPolyhedraVertexAttribute(id, vertex_attribute) {
-    const coloring_style = meshPolyhedraStyle(id).coloring
+    const { coloring } = meshPolyhedraStyle(id)
     return viewerStore.request(
       mesh_polyhedra_schemas.vertex_attribute,
       { id, ...vertex_attribute },
       {
         response_function: () => {
-          coloring_style.vertex = vertex_attribute
+          coloring.vertex = vertex_attribute
           console.log(
             setMeshPolyhedraVertexAttribute.name,
             { id },
@@ -110,7 +110,7 @@ export function useMeshPolyhedraStyle() {
     return meshPolyhedraStyle(id).coloring.polyhedron
   }
   function setMeshPolyhedraPolyhedronAttribute(id, polyhedron_attribute) {
-    const coloring = meshPolyhedraStyle(id).coloring
+    const { coloring } = meshPolyhedraStyle(id)
     return viewerStore.request(
       mesh_polyhedra_schemas.polyhedron_attribute,
       { id, ...polyhedron_attribute },
diff --git a/internal/stores/model/edges.js b/internal/stores/model/edges.js
index 0a62e40f..9f073963 100644
--- a/internal/stores/model/edges.js
+++ b/internal/stores/model/edges.js
@@ -38,7 +38,7 @@ export function useModelEdgesStyle() {
 
   function applyModelEdgesStyle(id) {
     const style = modelEdgesStyle(id)
-    return Promise.all([setModelEdgesVisibility(id, style.visibility)])
+    return Promise.resolve([setModelEdgesVisibility(id, style.visibility)])
   }
 
   return {
diff --git a/internal/stores/model/index.js b/internal/stores/model/index.js
index 7d83cfa8..1023dc93 100644
--- a/internal/stores/model/index.js
+++ b/internal/stores/model/index.js
@@ -2,16 +2,16 @@
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
 // Local imports
-import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
-import { useDataStyleStateStore } from "../data_style_state"
 import { useDataStore } from "@ogw_front/stores/data"
-import { useViewerStore } from "@ogw_front/stores/viewer"
-import { useModelSurfacesStyle } from "./surfaces"
-import { useModelCornersStyle } from "./corners"
+import { useDataStyleStateStore } from "../data_style_state"
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
 import { useModelBlocksStyle } from "./blocks"
-import { useModelLinesStyle } from "./lines"
+import { useModelCornersStyle } from "./corners"
 import { useModelEdgesStyle } from "./edges"
+import { useModelLinesStyle } from "./lines"
 import { useModelPointsStyle } from "./points"
+import { useModelSurfacesStyle } from "./surfaces"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
 const model_schemas = viewer_schemas.opengeodeweb_viewer.model
@@ -50,21 +50,21 @@ export default function useModelStyle() {
     const styles = dataStyleStateStore.styles[id]
     if (!styles) return visible_mesh_components
 
-    Object.entries(styles.corners || {}).forEach(([corner_id, style]) => {
+    for (const [corner_id, style] of Object.entries(styles.corners || {})) {
       if (style.visibility) visible_mesh_components.value.push(corner_id)
-    })
+    }
 
-    Object.entries(styles.lines || {}).forEach(([line_id, style]) => {
+    for (const [line_id, style] of Object.entries(styles.lines || {})) {
       if (style.visibility) visible_mesh_components.value.push(line_id)
-    })
+    }
 
-    Object.entries(styles.surfaces || {}).forEach(([surface_id, style]) => {
+    for (const [surface_id, style] of Object.entries(styles.surfaces || {})) {
       if (style.visibility) visible_mesh_components.value.push(surface_id)
-    })
+    }
 
-    Object.entries(styles.blocks || {}).forEach(([block_id, style]) => {
+    for (const [block_id, style] of Object.entries(styles.blocks || {})) {
       if (style.visibility) visible_mesh_components.value.push(block_id)
-    })
+    }
 
     return visible_mesh_components
   }
@@ -79,7 +79,7 @@ export default function useModelStyle() {
     } else if (component_type === "Block") {
       return modelBlocksStyleStore.modelBlockVisibility(id, component_id)
     }
-    throw new Error("Unknown model component_type: " + component_type)
+    throw new Error(`Unknown model component_type: ${component_type}`)
   }
 
   function modelColor(id) {
@@ -132,7 +132,7 @@ export default function useModelStyle() {
         visibility,
       )
     } else {
-      throw new Error("Unknown model component_type: " + component_type)
+      throw new Error(`Unknown model component_type: ${component_type}`)
     }
   }
 
@@ -155,7 +155,7 @@ export default function useModelStyle() {
       } else if (key === "edges") {
         promise_array.push(modelEdgesStyleStore.applyModelEdgesStyle(id))
       } else {
-        throw new Error("Unknown model key: " + key)
+        throw new Error(`Unknown model key: ${key}`)
       }
     }
     return Promise.all(promise_array)
diff --git a/internal/utils/api_fetch.js b/internal/utils/api_fetch.js
index c9f43c8d..0955c516 100644
--- a/internal/utils/api_fetch.js
+++ b/internal/utils/api_fetch.js
@@ -1,6 +1,9 @@
+// oxlint-disable-next-line id-length
 import _ from "lodash"
-import validate_schema from "@ogw_front/utils/validate_schema"
 import { useFeedbackStore } from "@ogw_front/stores/feedback"
+import validate_schema from "@ogw_front/utils/validate_schema"
+
+const ERROR_400 = 400
 
 export function api_fetch(
   microservice,
@@ -17,15 +20,15 @@ export function api_fetch(
     if (process.env.NODE_ENV !== "production") {
       console.log("Bad request", error, schema, params)
     }
-    feedbackStore.add_error(400, schema.$id, "Bad request", error)
-    throw new Error(schema.$id.concat(": ", error))
+    feedbackStore.add_error(ERROR_400, schema.$id, "Bad request", error)
+    throw new Error(`${schema.$id}: ${error}`)
   }
 
   microservice.start_request()
 
-  const method = schema.methods.filter((method) => method !== "OPTIONS")[0]
+  const method = schema.methods.find((methodItem) => methodItem !== "OPTIONS")
   const request_options = {
-    method: method,
+    method,
   }
   if (!_.isEmpty(body)) {
     request_options.body = body
diff --git a/internal/utils/viewer_call.js b/internal/utils/viewer_call.js
index 241c0bef..632e6169 100644
--- a/internal/utils/viewer_call.js
+++ b/internal/utils/viewer_call.js
@@ -1,7 +1,10 @@
-import validate_schema from "@ogw_front/utils/validate_schema"
+import pTimeout from "p-timeout"
 import { useFeedbackStore } from "@ogw_front/stores/feedback"
+import validate_schema from "@ogw_front/utils/validate_schema"
 
-export function viewer_call(
+const ERROR_400 = 400
+
+export async function viewer_call(
   microservice,
   { schema, params = {} },
   {
@@ -19,61 +22,54 @@ export function viewer_call(
     if (process.env.NODE_ENV !== "production") {
       console.log("Bad request", error, schema, params)
     }
-    feedbackStore.add_error(400, schema.$id, "Bad request", error)
-    throw new Error(schema.$id.concat(": ", error))
+    feedbackStore.add_error(ERROR_400, schema.$id, "Bad request", error)
+    throw new Error(`${schema.$id}: ${error}`)
   }
 
-  const client = microservice.client
+  const { client } = microservice
 
-  const promise = new Promise((resolve, reject) => {
+  async function performCall() {
     if (!client.getConnection) {
-      resolve()
       return
     }
     microservice.start_request()
 
-    client
-      .getConnection()
-      .getSession()
-      .call(schema.$id, [params])
-      .then(
-        (value) => {
-          if (response_function) {
-            response_function(value)
-          }
-          resolve()
-        },
-        (reason) => {
-          if (request_error_function) {
-            request_error_function(reason)
-          }
-          reject()
-        },
+    try {
+      const value = await client
+        .getConnection()
+        .getSession()
+        .call(schema.$id, [params])
+      if (response_function) {
+        response_function(value)
+      }
+      return value
+    } catch (error) {
+      feedbackStore.add_error(
+        error.code,
+        schema.$id,
+        error.message,
+        error.message,
       )
-      .catch((error) => {
-        feedbackStore.add_error(
-          error.code,
-          schema.$id,
-          error.message,
-          error.message,
-        )
-        if (response_error_function) {
-          response_error_function(error)
-        }
-        reject()
-      })
-      .finally(() => {
-        microservice.stop_request()
-      })
-  })
+      if (request_error_function) {
+        request_error_function(error)
+      }
+      if (response_error_function) {
+        response_error_function(error)
+      }
+      throw error
+    } finally {
+      microservice.stop_request()
+    }
+  }
+
   if (timeout !== undefined && timeout > 0) {
-    const timeoutPromise = setTimeout(() => {
-      reject(`${schema.$id}: Timed out after ${timeout}ms, ${schema} ${params}`)
-    }, timeout)
-    return Promise.race([promise, timeoutPromise])
-  } else {
-    return promise
+    return await pTimeout(performCall(), {
+      milliseconds: timeout,
+      message: `${schema.$id}: Timed out after ${timeout}ms`,
+    })
   }
+
+  return await performCall()
 }
 
 export default viewer_call
diff --git a/nuxt.config.js b/nuxt.config.js
index c7b8d207..fb8f09ee 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -20,7 +20,7 @@ export default defineNuxtConfig({
   },
 
   alias: {
-    "@ogw_front": __dirname + "/app/",
+    "@ogw_front": `${__dirname}/app/`,
   },
 
   // ** Global CSS
diff --git a/scripts/generate_geode_objects.js b/scripts/generate_geode_objects.js
index 320e1096..fc178f58 100644
--- a/scripts/generate_geode_objects.js
+++ b/scripts/generate_geode_objects.js
@@ -1,6 +1,6 @@
-import * as path from "path"
-import * as fs from "fs"
-import * as process from "process"
+import fs from "node:fs"
+import path from "node:path"
+import process from "node:process"
 
 const output_file = path.join(process.cwd(), "assets/geode_objects")
 
@@ -8,9 +8,9 @@ if (fs.existsSync(output_file)) {
   fs.unlinkSync(output_file)
 }
 
-var files = fs.readdirSync("assets/img/geode_objects/")
-var imports = ""
-var geode_objects = "const geode_objects = {"
+const files = fs.readdirSync("assets/img/geode_objects/")
+let imports = ""
+let geode_objects = "const geode_objects = {"
 
 for (const file of files) {
   const geode_object = file.replace(".svg", "")
@@ -20,6 +20,6 @@ for (const file of files) {
   geode_objects += `${geode_object}:{\n tooltip: "${geode_object}",\n image: ${geode_object},\n},\n`
 }
 geode_objects += "}\n\n export default geode_objects"
-fs.writeFileSync(output_file, imports + "\n" + geode_objects)
+fs.writeFileSync(output_file, `${imports}\n${geode_objects}`)
 
 console.log("Fichier JS créé avec succès :", output_file)
diff --git a/tests/integration/microservices/back/requirements.txt b/tests/integration/microservices/back/requirements.txt
index f46331da..bd3a3ef5 100644
--- a/tests/integration/microservices/back/requirements.txt
+++ b/tests/integration/microservices/back/requirements.txt
@@ -5,4 +5,3 @@
 #    pip-compile --output-file=tests/integration/microservices/back/requirements.txt tests/integration/microservices/back/requirements.in
 #
 
-opengeodeweb-back==6.*,>=6.1.0rc3
diff --git a/tests/integration/microservices/viewer/requirements.txt b/tests/integration/microservices/viewer/requirements.txt
index 950be281..4d097394 100644
--- a/tests/integration/microservices/viewer/requirements.txt
+++ b/tests/integration/microservices/viewer/requirements.txt
@@ -5,4 +5,3 @@
 #    pip-compile --output-file=tests/integration/microservices/viewer/requirements.txt tests/integration/microservices/viewer/requirements.in
 #
 
-opengeodeweb-viewer==1.*,>=1.15.1rc2
diff --git a/tests/integration/setup.js b/tests/integration/setup.js
index 5703d0ea..0e56a638 100644
--- a/tests/integration/setup.js
+++ b/tests/integration/setup.js
@@ -1,26 +1,29 @@
 // Node.js imports
-import path from "path"
-import { v4 as uuidv4 } from "uuid"
 import { WebSocket } from "ws"
+import path from "node:path"
+import { v4 as uuidv4 } from "uuid"
 
 // Third party imports
-import { setActivePinia } from "pinia"
-import { createTestingPinia } from "@pinia/testing"
 import { afterAll, beforeAll, expect, vi } from "vitest"
+import { createTestingPinia } from "@pinia/testing"
+import { setActivePinia } from "pinia"
 
 // Local imports
-import { useGeodeStore } from "@ogw_front/stores/geode"
-import { useViewerStore } from "@ogw_front/stores/viewer"
-import { useInfraStore } from "@ogw_front/stores/infra"
-import { appMode } from "@ogw_front/utils/app_mode"
-import { importFile } from "@ogw_front/utils/file_import_workflow"
-import Status from "@ogw_front/utils/status"
 import {
+  delete_folder_recursive,
   executable_name,
   executable_path,
+  kill_back,
+  kill_viewer,
   run_back,
   run_viewer,
 } from "@ogw_front/utils/local"
+import Status from "@ogw_front/utils/status"
+import { appMode } from "@ogw_front/utils/app_mode"
+import { importFile } from "@ogw_front/utils/file_import_workflow"
+import { useGeodeStore } from "@ogw_front/stores/geode"
+import { useInfraStore } from "@ogw_front/stores/infra"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
 const data_folder = path.join("tests", "integration", "data")
@@ -77,9 +80,9 @@ async function setupIntegrationTests(file_name, geode_object) {
   return { id, back_port, viewer_port, project_folder_path }
 }
 
-const mockLockRequest = vi.fn().mockImplementation(async (name, callback) => {
-  return callback({ name })
-})
+const mockLockRequest = vi
+  .fn()
+  .mockImplementation(async (name, callback) => await callback({ name }))
 
 vi.stubGlobal("navigator", {
   ...navigator,
@@ -96,4 +99,13 @@ afterAll(() => {
   delete global.WebSocket
 })
 
-export { runMicroservices, setupIntegrationTests }
+async function teardownIntegrationTests(
+  back_port,
+  viewer_port,
+  project_folder_path,
+) {
+  await Promise.all([kill_back(back_port), kill_viewer(viewer_port)])
+  delete_folder_recursive(project_folder_path)
+}
+
+export { runMicroservices, setupIntegrationTests, teardownIntegrationTests }
diff --git a/tests/integration/stores/data_style/mesh/cells.nuxt.test.js b/tests/integration/stores/data_style/mesh/cells.nuxt.test.js
index c9dadb6b..838eec71 100644
--- a/tests/integration/stores/data_style/mesh/cells.nuxt.test.js
+++ b/tests/integration/stores/data_style/mesh/cells.nuxt.test.js
@@ -3,29 +3,33 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" }
 
 // Local imports
-import Status from "@ogw_front/utils/status"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
-import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
+import Status from "@ogw_front/utils/status"
 import { setupIntegrationTests } from "../../../setup"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
+const INTERVAL_TIMEOUT = 20000
 const mesh_cells_schemas = viewer_schemas.opengeodeweb_viewer.mesh.cells
 const file_name = "test.og_rgd2d"
 const geode_object = "RegularGrid2D"
 const vertex_attribute = { name: "points" }
 const cell_attribute = { name: "RGB_data" }
 
-let id, back_port, viewer_port, project_folder_path
+let back_port = 0,
+  id = "",
+  project_folder_path = "",
+  viewer_port = 0
 
 beforeEach(async () => {
   ;({ id, back_port, viewer_port, project_folder_path } =
     await setupIntegrationTests(file_name, geode_object))
-}, 20000)
+}, INTERVAL_TIMEOUT)
 
 afterEach(async () => {
   console.log(
@@ -149,27 +153,29 @@ describe("Mesh cells", () => {
             dataStyleStore.setMeshCellsCellAttribute(id, cell_attribute),
         },
       ]
-      for (let i = 0; i < coloringTypes.length; i++) {
-        if (coloringTypes[i].function) {
+
+      async function testColoring(coloringType, expectedColoringType) {
+        if (coloringType.function) {
           expect(() =>
-            dataStyleStore.setMeshCellsActiveColoring(
-              id,
-              coloringTypes[i].name,
-            ),
+            dataStyleStore.setMeshCellsActiveColoring(id, coloringType.name),
           ).toThrowError()
-          await coloringTypes[i].function()
+          await coloringType.function()
         }
         const result = dataStyleStore.setMeshCellsActiveColoring(
           id,
-          coloringTypes[i].name,
+          coloringType.name,
         )
         expect(result).toBeInstanceOf(Promise)
         await result
         expect(dataStyleStore.meshCellsActiveColoring(id)).toBe(
-          coloringTypes[i].name,
+          expectedColoringType,
         )
         expect(viewerStore.status).toBe(Status.CONNECTED)
       }
+
+      await testColoring(coloringTypes[0], "color")
+      await testColoring(coloringTypes[1], "vertex")
+      await testColoring(coloringTypes[2], "cell")
     })
   })
 
diff --git a/tests/integration/stores/data_style/mesh/edges.nuxt.test.js b/tests/integration/stores/data_style/mesh/edges.nuxt.test.js
index 64cea744..49881d07 100644
--- a/tests/integration/stores/data_style/mesh/edges.nuxt.test.js
+++ b/tests/integration/stores/data_style/mesh/edges.nuxt.test.js
@@ -3,29 +3,33 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" }
 
 // Local imports
-import Status from "@ogw_front/utils/status"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
-import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
+import Status from "@ogw_front/utils/status"
 import { setupIntegrationTests } from "../../../setup"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
+const INTERVAL_TIMEOUT = 25000
 const mesh_edges_schemas = viewer_schemas.opengeodeweb_viewer.mesh.edges
 const file_name = "test.og_edc3d"
 const geode_object = "EdgedCurve3D"
 const vertex_attribute = { name: "vertex_attribute" }
 const edge_attribute = { name: "edge_attribute" }
 
-let id, back_port, viewer_port, project_folder_path
+let back_port = 0,
+  id = "",
+  project_folder_path = "",
+  viewer_port = 0
 
 beforeEach(async () => {
   ;({ id, back_port, viewer_port, project_folder_path } =
     await setupIntegrationTests(file_name, geode_object))
-}, 25000)
+}, INTERVAL_TIMEOUT)
 
 afterEach(async () => {
   console.log(
@@ -132,27 +136,29 @@ describe("Mesh edges", () => {
             dataStyleStore.setMeshEdgesEdgeAttribute(id, edge_attribute),
         },
       ]
-      for (let i = 0; i < coloringTypes.length; i++) {
-        if (coloringTypes[i].function) {
+
+      async function testColoring(coloringType, expectedColoringType) {
+        if (coloringType.function) {
           expect(() =>
-            dataStyleStore.setMeshEdgesActiveColoring(
-              id,
-              coloringTypes[i].name,
-            ),
+            dataStyleStore.setMeshEdgesActiveColoring(id, coloringType.name),
           ).toThrowError()
-          await coloringTypes[i].function()
+          await coloringType.function()
         }
         const result = dataStyleStore.setMeshEdgesActiveColoring(
           id,
-          coloringTypes[i].name,
+          coloringType.name,
         )
         expect(result).toBeInstanceOf(Promise)
         await result
         expect(dataStyleStore.meshEdgesActiveColoring(id)).toBe(
-          coloringTypes[i].name,
+          expectedColoringType,
         )
         expect(viewerStore.status).toBe(Status.CONNECTED)
       }
+
+      await testColoring(coloringTypes[0], "color")
+      await testColoring(coloringTypes[1], "vertex")
+      await testColoring(coloringTypes[2], "edge")
     })
     test("Edges apply style", async () => {
       const dataStyleStore = useDataStyleStore()
diff --git a/tests/integration/stores/data_style/mesh/index.nuxt.test.js b/tests/integration/stores/data_style/mesh/index.nuxt.test.js
index ec310500..358e0dc4 100644
--- a/tests/integration/stores/data_style/mesh/index.nuxt.test.js
+++ b/tests/integration/stores/data_style/mesh/index.nuxt.test.js
@@ -3,27 +3,31 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" }
 
 // Local imports
-import Status from "@ogw_front/utils/status"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
-import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
+import Status from "@ogw_front/utils/status"
 import { setupIntegrationTests } from "../../../setup"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
+const INTERVAL_TIMEOUT = 20000
 const mesh_schemas = viewer_schemas.opengeodeweb_viewer.mesh
 const file_name = "test.og_rgd3d"
 const geode_object = "RegularGrid3D"
 
-let id, back_port, viewer_port, project_folder_path
+let back_port = 0,
+  id = "",
+  project_folder_path = "",
+  viewer_port = 0
 
 beforeEach(async () => {
   ;({ id, back_port, viewer_port, project_folder_path } =
     await setupIntegrationTests(file_name, geode_object))
-}, 20000)
+}, INTERVAL_TIMEOUT)
 
 afterEach(async () => {
   console.log(
diff --git a/tests/integration/stores/data_style/mesh/points.nuxt.test.js b/tests/integration/stores/data_style/mesh/points.nuxt.test.js
index f48e857a..62c208cd 100644
--- a/tests/integration/stores/data_style/mesh/points.nuxt.test.js
+++ b/tests/integration/stores/data_style/mesh/points.nuxt.test.js
@@ -3,28 +3,32 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" }
 
 // Local imports
-import Status from "@ogw_front/utils/status"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
-import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
+import Status from "@ogw_front/utils/status"
 import { setupIntegrationTests } from "../../../setup"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
+const INTERVAL_TIMEOUT = 20000
 const mesh_points_schemas = viewer_schemas.opengeodeweb_viewer.mesh.points
 const file_name = "test.og_edc2d"
 const geode_object = "EdgedCurve2D"
 const vertex_attribute = { name: "points" }
 
-let id, back_port, viewer_port, project_folder_path
+let back_port = 0,
+  id = "",
+  project_folder_path = "",
+  viewer_port = 0
 
 beforeEach(async () => {
   ;({ id, back_port, viewer_port, project_folder_path } =
     await setupIntegrationTests(file_name, geode_object))
-}, 20000)
+}, INTERVAL_TIMEOUT)
 
 afterEach(async () => {
   console.log(
@@ -92,27 +96,27 @@ describe("Mesh points", () => {
             dataStyleStore.setMeshPointsVertexAttribute(id, vertex_attribute),
         },
       ]
-      for (let i = 0; i < coloringTypes.length; i++) {
-        if (coloringTypes[i].function) {
+      async function testColoring(coloringType, expectedColoringType) {
+        if (coloringType.function) {
           expect(() =>
-            dataStyleStore.setMeshPointsActiveColoring(
-              id,
-              coloringTypes[i].name,
-            ),
+            dataStyleStore.setMeshPointsActiveColoring(id, coloringType.name),
           ).toThrowError()
-          await coloringTypes[i].function()
+          await coloringType.function()
         }
         const result = dataStyleStore.setMeshPointsActiveColoring(
           id,
-          coloringTypes[i].name,
+          coloringType.name,
         )
         expect(result).toBeInstanceOf(Promise)
         await result
         expect(dataStyleStore.meshPointsActiveColoring(id)).toBe(
-          coloringTypes[i].name,
+          expectedColoringType,
         )
         expect(viewerStore.status).toBe(Status.CONNECTED)
       }
+
+      await testColoring(coloringTypes[0], "color")
+      await testColoring(coloringTypes[1], "vertex")
     })
   })
 
diff --git a/tests/integration/stores/data_style/mesh/polygons.nuxt.test.js b/tests/integration/stores/data_style/mesh/polygons.nuxt.test.js
index a7408b95..925d537f 100644
--- a/tests/integration/stores/data_style/mesh/polygons.nuxt.test.js
+++ b/tests/integration/stores/data_style/mesh/polygons.nuxt.test.js
@@ -3,29 +3,33 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" }
 
 // Local imports
-import Status from "@ogw_front/utils/status"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
-import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
+import Status from "@ogw_front/utils/status"
 import { setupIntegrationTests } from "../../../setup"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
+const INTERVAL_TIMEOUT = 20000
 const mesh_polygons_schemas = viewer_schemas.opengeodeweb_viewer.mesh.polygons
 const file_name = "test.og_psf3d"
 const geode_object = "PolygonalSurface3D"
 const vertex_attribute = { name: "points" }
 const polygon_attribute = { name: "test_attribute" }
 
-let id, back_port, viewer_port, project_folder_path
+let back_port = 0,
+  id = "",
+  project_folder_path = "",
+  viewer_port = 0
 
 beforeEach(async () => {
   ;({ id, back_port, viewer_port, project_folder_path } =
     await setupIntegrationTests(file_name, geode_object))
-}, 20000)
+}, INTERVAL_TIMEOUT)
 
 afterEach(async () => {
   console.log(
@@ -153,27 +157,28 @@ describe("Mesh polygons", () => {
         },
       ]
 
-      for (let i = 0; i < coloringTypes.length; i++) {
-        if (coloringTypes[i].function) {
+      async function testColoring(coloringType, expectedColoringType) {
+        if (coloringType.function) {
           expect(() =>
-            dataStyleStore.setMeshPolygonsActiveColoring(
-              id,
-              coloringTypes[i].name,
-            ),
+            dataStyleStore.setMeshPolygonsActiveColoring(id, coloringType.name),
           ).toThrowError()
-          await coloringTypes[i].function()
+          await coloringType.function()
         }
         const result = dataStyleStore.setMeshPolygonsActiveColoring(
           id,
-          coloringTypes[i].name,
+          coloringType.name,
         )
         expect(result).toBeInstanceOf(Promise)
         await result
         expect(dataStyleStore.meshPolygonsActiveColoring(id)).toBe(
-          coloringTypes[i].name,
+          expectedColoringType,
         )
         expect(viewerStore.status).toBe(Status.CONNECTED)
       }
+
+      await testColoring(coloringTypes[0], "color")
+      await testColoring(coloringTypes[1], "vertex")
+      await testColoring(coloringTypes[2], "polygon")
     })
   })
 
diff --git a/tests/integration/stores/data_style/mesh/polyhedra.nuxt.test.js b/tests/integration/stores/data_style/mesh/polyhedra.nuxt.test.js
index ed3ba99f..fba08725 100644
--- a/tests/integration/stores/data_style/mesh/polyhedra.nuxt.test.js
+++ b/tests/integration/stores/data_style/mesh/polyhedra.nuxt.test.js
@@ -3,29 +3,33 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" }
 
 // Local imports
-import Status from "@ogw_front/utils/status"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
-import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
+import Status from "@ogw_front/utils/status"
 import { setupIntegrationTests } from "../../../setup"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
+const INTERVAL_TIMEOUT = 20000
 const mesh_polyhedra_schemas = viewer_schemas.opengeodeweb_viewer.mesh.polyhedra
 const file_name = "test.vtu"
 const geode_object = "HybridSolid3D"
 const vertex_attribute = { name: "toto_on_vertices" }
 const polyhedron_attribute = { name: "toto_on_polyhedra" }
 
-let id, back_port, viewer_port, project_folder_path
+let back_port = 0,
+  id = "",
+  project_folder_path = "",
+  viewer_port = 0
 
 beforeEach(async () => {
   ;({ id, back_port, viewer_port, project_folder_path } =
     await setupIntegrationTests(file_name, geode_object))
-}, 20000)
+}, INTERVAL_TIMEOUT)
 
 afterEach(async () => {
   console.log(
@@ -100,27 +104,31 @@ describe("Mesh polyhedra", () => {
             ),
         },
       ]
-      for (let i = 0; i < coloringTypes.length; i++) {
-        if (coloringTypes[i].function) {
+      async function testColoring(coloringType, expectedColoringType) {
+        if (coloringType.function) {
           expect(() =>
             dataStyleStore.setMeshPolyhedraActiveColoring(
               id,
-              coloringTypes[i].name,
+              coloringType.name,
             ),
           ).toThrowError()
-          await coloringTypes[i].function()
+          await coloringType.function()
         }
         const result = dataStyleStore.setMeshPolyhedraActiveColoring(
           id,
-          coloringTypes[i].name,
+          coloringType.name,
         )
         expect(result).toBeInstanceOf(Promise)
         await result
         expect(dataStyleStore.meshPolyhedraActiveColoring(id)).toBe(
-          coloringTypes[i].name,
+          expectedColoringType,
         )
         expect(viewerStore.status).toBe(Status.CONNECTED)
       }
+
+      await testColoring(coloringTypes[0], "color")
+      await testColoring(coloringTypes[1], "vertex")
+      await testColoring(coloringTypes[2], "polyhedron")
     })
   })
 
diff --git a/tests/integration/stores/data_style/model/blocks.nuxt.test.js b/tests/integration/stores/data_style/model/blocks.nuxt.test.js
index 79613c00..85cd3a49 100644
--- a/tests/integration/stores/data_style/model/blocks.nuxt.test.js
+++ b/tests/integration/stores/data_style/model/blocks.nuxt.test.js
@@ -3,28 +3,32 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" }
 
 // Local imports
-import Status from "@ogw_front/utils/status"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
-import { useViewerStore } from "@ogw_front/stores/viewer"
-import { useDataStore } from "@ogw_front/stores/data"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
+import Status from "@ogw_front/utils/status"
 import { setupIntegrationTests } from "../../../setup"
+import { useDataStore } from "@ogw_front/stores/data"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
+const INTERVAL_TIMEOUT = 20000
 const model_blocks_schemas = viewer_schemas.opengeodeweb_viewer.model.blocks
 const file_name = "test.og_brep"
 const geode_object = "BRep"
 
-let id, back_port, viewer_port, project_folder_path
+let back_port = 0,
+  id = "",
+  project_folder_path = "",
+  viewer_port = 0
 
 beforeEach(async () => {
   ;({ id, back_port, viewer_port, project_folder_path } =
     await setupIntegrationTests(file_name, geode_object))
-}, 20000)
+}, INTERVAL_TIMEOUT)
 
 afterEach(async () => {
   console.log(
diff --git a/tests/integration/stores/data_style/model/corners.nuxt.test.js b/tests/integration/stores/data_style/model/corners.nuxt.test.js
index da16637e..26241b67 100644
--- a/tests/integration/stores/data_style/model/corners.nuxt.test.js
+++ b/tests/integration/stores/data_style/model/corners.nuxt.test.js
@@ -3,28 +3,32 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" }
 
 // Local imports
-import Status from "@ogw_front/utils/status"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
-import { useViewerStore } from "@ogw_front/stores/viewer"
-import { useDataStore } from "@ogw_front/stores/data"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
+import Status from "@ogw_front/utils/status"
 import { setupIntegrationTests } from "../../../setup"
+import { useDataStore } from "@ogw_front/stores/data"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
+const INTERVAL_TIMEOUT = 20000
 const model_corners_schemas = viewer_schemas.opengeodeweb_viewer.model.corners
 const file_name = "test.og_brep"
 const geode_object = "BRep"
 
-let id, back_port, viewer_port, project_folder_path
+let back_port = 0,
+  id = "",
+  project_folder_path = "",
+  viewer_port = 0
 
 beforeEach(async () => {
   ;({ id, back_port, viewer_port, project_folder_path } =
     await setupIntegrationTests(file_name, geode_object))
-}, 20000)
+}, INTERVAL_TIMEOUT)
 
 afterEach(async () => {
   console.log(
diff --git a/tests/integration/stores/data_style/model/edges.nuxt.test.js b/tests/integration/stores/data_style/model/edges.nuxt.test.js
index 08d020d4..ed8aa976 100644
--- a/tests/integration/stores/data_style/model/edges.nuxt.test.js
+++ b/tests/integration/stores/data_style/model/edges.nuxt.test.js
@@ -3,27 +3,31 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" }
 
 // Local imports
-import Status from "@ogw_front/utils/status"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
-import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
+import Status from "@ogw_front/utils/status"
 import { setupIntegrationTests } from "../../../setup"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
+const INTERVAL_TIMEOUT = 25000
 const model_edges_schemas = viewer_schemas.opengeodeweb_viewer.model.edges
 const file_name = "test.og_brep"
 const geode_object = "BRep"
 
-let id, back_port, viewer_port, project_folder_path
+let back_port = 0,
+  id = "",
+  project_folder_path = "",
+  viewer_port = 0
 
 beforeEach(async () => {
   ;({ id, back_port, viewer_port, project_folder_path } =
     await setupIntegrationTests(file_name, geode_object))
-}, 25000)
+}, INTERVAL_TIMEOUT)
 
 afterEach(async () => {
   console.log(
diff --git a/tests/integration/stores/data_style/model/index.nuxt.test.js b/tests/integration/stores/data_style/model/index.nuxt.test.js
index 77780bb2..5cce7a0a 100644
--- a/tests/integration/stores/data_style/model/index.nuxt.test.js
+++ b/tests/integration/stores/data_style/model/index.nuxt.test.js
@@ -3,27 +3,31 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" }
 
 // Local imports
-import Status from "@ogw_front/utils/status"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
-import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
+import Status from "@ogw_front/utils/status"
 import { setupIntegrationTests } from "../../../setup"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
+const INTERVAL_TIMEOUT = 20000
 const model_schemas = viewer_schemas.opengeodeweb_viewer.model
 const file_name = "test.og_brep"
 const geode_object = "BRep"
 
-let id, back_port, viewer_port, project_folder_path
+let back_port = 0,
+  id = "",
+  project_folder_path = "",
+  viewer_port = 0
 
 beforeEach(async () => {
   ;({ id, back_port, viewer_port, project_folder_path } =
     await setupIntegrationTests(file_name, geode_object))
-}, 20000)
+}, INTERVAL_TIMEOUT)
 
 afterEach(async () => {
   console.log(
diff --git a/tests/integration/stores/data_style/model/lines.nuxt.test.js b/tests/integration/stores/data_style/model/lines.nuxt.test.js
index a3f5cc64..17fa9be1 100644
--- a/tests/integration/stores/data_style/model/lines.nuxt.test.js
+++ b/tests/integration/stores/data_style/model/lines.nuxt.test.js
@@ -3,28 +3,32 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" }
 
 // Local imports
-import Status from "@ogw_front/utils/status"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
-import { useViewerStore } from "@ogw_front/stores/viewer"
-import { useDataStore } from "@ogw_front/stores/data"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
+import Status from "@ogw_front/utils/status"
 import { setupIntegrationTests } from "../../../setup"
+import { useDataStore } from "@ogw_front/stores/data"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
+const INTERVAL_TIMEOUT = 20000
 const model_lines_schemas = viewer_schemas.opengeodeweb_viewer.model.lines
 const file_name = "test.og_brep"
 const geode_object = "BRep"
 
-let id, back_port, viewer_port, project_folder_path
+let back_port = 0,
+  id = "",
+  project_folder_path = "",
+  viewer_port = 0
 
 beforeEach(async () => {
   ;({ id, back_port, viewer_port, project_folder_path } =
     await setupIntegrationTests(file_name, geode_object))
-}, 20000)
+}, INTERVAL_TIMEOUT)
 
 afterEach(async () => {
   console.log("afterEach model lines kill", back_port, viewer_port)
diff --git a/tests/integration/stores/data_style/model/points.nuxt.test.js b/tests/integration/stores/data_style/model/points.nuxt.test.js
index 022b1240..a5da3f2c 100644
--- a/tests/integration/stores/data_style/model/points.nuxt.test.js
+++ b/tests/integration/stores/data_style/model/points.nuxt.test.js
@@ -3,27 +3,31 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" }
 
 // Local imports
-import Status from "@ogw_front/utils/status"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
-import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
+import Status from "@ogw_front/utils/status"
 import { setupIntegrationTests } from "../../../setup"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
+const INTERVAL_TIMEOUT = 20000
 const model_points_schemas = viewer_schemas.opengeodeweb_viewer.model.points
 const file_name = "test.og_brep"
 const geode_object = "BRep"
 
-let id, back_port, viewer_port, project_folder_path
+let back_port = 0,
+  id = "",
+  project_folder_path = "",
+  viewer_port = 0
 
 beforeEach(async () => {
   ;({ id, back_port, viewer_port, project_folder_path } =
     await setupIntegrationTests(file_name, geode_object))
-}, 20000)
+}, INTERVAL_TIMEOUT)
 
 afterEach(async () => {
   console.log("afterEach model points kill", back_port, viewer_port)
diff --git a/tests/integration/stores/data_style/model/surfaces.nuxt.test.js b/tests/integration/stores/data_style/model/surfaces.nuxt.test.js
index a32f5604..140c2f1f 100644
--- a/tests/integration/stores/data_style/model/surfaces.nuxt.test.js
+++ b/tests/integration/stores/data_style/model/surfaces.nuxt.test.js
@@ -3,28 +3,32 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" }
 
 // Local imports
-import Status from "@ogw_front/utils/status"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
-import { useDataStore } from "@ogw_front/stores/data"
-import { useViewerStore } from "@ogw_front/stores/viewer"
 import {
   delete_folder_recursive,
   kill_back,
   kill_viewer,
 } from "@ogw_front/utils/local"
+import Status from "@ogw_front/utils/status"
 import { setupIntegrationTests } from "../../../setup"
+import { useDataStore } from "@ogw_front/stores/data"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Local constants
+const INTERVAL_TIMEOUT = 20000
 const model_surfaces_schemas = viewer_schemas.opengeodeweb_viewer.model.surfaces
 const file_name = "test.og_brep"
 const geode_object = "BRep"
 
-let id, back_port, viewer_port, project_folder_path
+let back_port = 0,
+  id = "",
+  project_folder_path = "",
+  viewer_port = 0
 
 beforeEach(async () => {
   ;({ id, back_port, viewer_port, project_folder_path } =
     await setupIntegrationTests(file_name, geode_object))
-}, 20000)
+}, INTERVAL_TIMEOUT)
 
 afterEach(async () => {
   console.log(
diff --git a/tests/integration/stores/viewer.nuxt.test.js b/tests/integration/stores/viewer.nuxt.test.js
index 60b21236..424d8d55 100644
--- a/tests/integration/stores/viewer.nuxt.test.js
+++ b/tests/integration/stores/viewer.nuxt.test.js
@@ -1,17 +1,24 @@
 // Global imports
 
 // Third party imports
-import { setActivePinia } from "pinia"
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import { createTestingPinia } from "@pinia/testing"
-import { describe, test, expect, beforeEach, vi } from "vitest"
+import { setActivePinia } from "pinia"
 
 import opengeodeweb_viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
 // Local imports
-import { useViewerStore } from "@ogw_front/stores/viewer"
 import Status from "@ogw_front/utils/status"
+import { useViewerStore } from "@ogw_front/stores/viewer"
 
-import { runMicroservices } from "../../integration/setup"
+import {
+  runMicroservices,
+  teardownIntegrationTests,
+} from "../../integration/setup"
+
+const CONNECT_TIMEOUT = 25000
+
+let back_port, viewer_port, project_folder_path
 
 beforeEach(() => {
   const pinia = createTestingPinia({
@@ -21,41 +28,60 @@ beforeEach(() => {
   setActivePinia(pinia)
 })
 
+afterEach(async () => {
+  await teardownIntegrationTests(back_port, viewer_port, project_folder_path)
+})
+
 describe("Viewer Store", () => {
   describe("actions", () => {
     describe("ws_connect", () => {
-      test("ws_connect", async () => {
-        await runMicroservices()
-        const viewerStore = useViewerStore()
-        await viewerStore.ws_connect()
-        expect(viewerStore.status).toBe(Status.CONNECTED)
-      }, 25000)
+      test(
+        "ws_connect",
+        async () => {
+          ;({ back_port, viewer_port, project_folder_path } =
+            await runMicroservices())
+          const viewerStore = useViewerStore()
+          await viewerStore.ws_connect()
+          expect(viewerStore.status).toBe(Status.CONNECTED)
+        },
+        CONNECT_TIMEOUT,
+      )
     })
     describe("connect", () => {
-      test("connect", async () => {
-        await runMicroservices()
-        const viewerStore = useViewerStore()
-        await viewerStore.connect()
-        expect(viewerStore.status).toBe(Status.CONNECTED)
-      }, 25000)
+      test(
+        "connect",
+        async () => {
+          ;({ back_port, viewer_port, project_folder_path } =
+            await runMicroservices())
+          const viewerStore = useViewerStore()
+          await viewerStore.connect()
+          expect(viewerStore.status).toBe(Status.CONNECTED)
+        },
+        CONNECT_TIMEOUT,
+      )
     })
 
     describe("request", () => {
-      test("request", async () => {
-        const schema =
-          opengeodeweb_viewer_schemas.opengeodeweb_viewer.viewer.render
-        await runMicroservices()
-        const viewerStore = useViewerStore()
-        const timeout = 1
-        const params = {}
-        expect(() =>
-          viewerStore
-            .request(schema, params, {}, timeout)
-            .rejects.toThrow(
-              `${schema.$id}: Timed out after ${timeout}ms, ${schema} ${params}`,
-            ),
-        )
-      }, 25000)
+      test(
+        "request",
+        async () => {
+          const schema =
+            opengeodeweb_viewer_schemas.opengeodeweb_viewer.viewer.render
+          ;({ back_port, viewer_port, project_folder_path } =
+            await runMicroservices())
+          const viewerStore = useViewerStore()
+          const timeout = 1
+          const params = {}
+          expect(() =>
+            viewerStore
+              .request(schema, params, {}, timeout)
+              .rejects.toThrow(
+                `${schema.$id}: Timed out after ${timeout}ms, ${schema} ${params}`,
+              ),
+          )
+        },
+        CONNECT_TIMEOUT,
+      )
     })
   })
 })
diff --git a/tests/setup_indexeddb.js b/tests/setup_indexeddb.js
index 93c88c2f..7132d02a 100644
--- a/tests/setup_indexeddb.js
+++ b/tests/setup_indexeddb.js
@@ -1,3 +1,4 @@
 import { setup } from "vitest-indexeddb"
 
+// eslint-disable-next-line jest/require-hook
 setup()
diff --git a/tests/unit/components/CrsSelector.nuxt.test.js b/tests/unit/components/CrsSelector.nuxt.test.js
index 2abec900..2c391017 100644
--- a/tests/unit/components/CrsSelector.nuxt.test.js
+++ b/tests/unit/components/CrsSelector.nuxt.test.js
@@ -1,18 +1,18 @@
-import { mountSuspended } from "@nuxt/test-utils/runtime"
 import { describe, expect, test, vi } from "vitest"
-import { setActivePinia } from "pinia"
+
 import { createTestingPinia } from "@pinia/testing"
+import { mountSuspended } from "@nuxt/test-utils/runtime"
+import { setActivePinia } from "pinia"
 
-import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import CrsSelector from "@ogw_front/components/CrsSelector"
 import { useGeodeStore } from "@ogw_front/stores/geode"
 
 import { vuetify } from "../../utils"
 
-const crs_selector_schema =
-  schemas.opengeodeweb_back.geographic_coordinate_systems
+const EXPECTED_LENGTH = 1
+const FIRST_INDEX = 0
 
-describe("CrsSelector", () => {
+describe(CrsSelector, () => {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
@@ -50,9 +50,9 @@ describe("CrsSelector", () => {
     const input = await td.find("input")
     await input.trigger("click")
     expect(wrapper.emitted()).toHaveProperty("update_values")
-    expect(wrapper.emitted().update_values).toHaveLength(1)
-    expect(wrapper.emitted().update_values[0][0]).toEqual({
-      [key_to_update]: crs_list[0],
+    expect(wrapper.emitted().update_values).toHaveLength(EXPECTED_LENGTH)
+    expect(wrapper.emitted().update_values[FIRST_INDEX][FIRST_INDEX]).toEqual({
+      [key_to_update]: crs_list[FIRST_INDEX],
     })
   })
 })
diff --git a/tests/unit/components/ExtensionSelector.nuxt.test.js b/tests/unit/components/ExtensionSelector.nuxt.test.js
index 0b47caa0..a00a5b4b 100644
--- a/tests/unit/components/ExtensionSelector.nuxt.test.js
+++ b/tests/unit/components/ExtensionSelector.nuxt.test.js
@@ -1,17 +1,21 @@
+import * as components from "vuetify/components"
 import { describe, expect, test, vi } from "vitest"
-import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
-import { setActivePinia } from "pinia"
+import { mountSuspended, registerEndpoint } from "@nuxt/test-utils/runtime"
 import { createTestingPinia } from "@pinia/testing"
-import * as components from "vuetify/components"
+import { setActivePinia } from "pinia"
 
-import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import ExtensionSelector from "@ogw_front/components/ExtensionSelector"
+import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import { useGeodeStore } from "@ogw_front/stores/geode"
 import { vuetify } from "../../utils"
 
+const EXPECTED_LENGTH = 1
+const FIRST_INDEX = 0
+const SECOND_INDEX = 1
+
 const schema = schemas.opengeodeweb_back.geode_objects_and_output_extensions
 
-describe("ExtensionSelector", async () => {
+describe(ExtensionSelector, async () => {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
@@ -38,7 +42,7 @@ describe("ExtensionSelector", async () => {
     const output_extension = "msh"
 
     registerEndpoint(schema.$id, {
-      method: schema.methods[0],
+      method: schema.methods[FIRST_INDEX],
       handler: () => ({
         geode_objects_and_output_extensions: {
           BRep: { msh: { is_saveable: true } },
@@ -52,12 +56,14 @@ describe("ExtensionSelector", async () => {
       props: { geode_object_type: "BRep", filenames: ["test.toto"] },
     })
     await nextTick()
-    expect(wrapper.exists()).toBe(true)
+    expect(wrapper.exists()).toBeTruthy()
     const v_card = await wrapper.findAllComponents(components.VCard)
-    await v_card[1].trigger("click")
+    await v_card[SECOND_INDEX].trigger("click")
     expect(wrapper.emitted()).toHaveProperty("update_values")
-    expect(wrapper.emitted().update_values).toHaveLength(1)
-    expect(wrapper.emitted().update_values[0][0]).toStrictEqual({
+    expect(wrapper.emitted().update_values).toHaveLength(EXPECTED_LENGTH)
+    expect(
+      wrapper.emitted().update_values[FIRST_INDEX][FIRST_INDEX],
+    ).toStrictEqual({
       output_geode_object,
       output_extension,
     })
diff --git a/tests/unit/components/FeedBack/ErrorsBanner.nuxt.test.js b/tests/unit/components/FeedBack/ErrorsBanner.nuxt.test.js
index 30a56b3b..f9549768 100644
--- a/tests/unit/components/FeedBack/ErrorsBanner.nuxt.test.js
+++ b/tests/unit/components/FeedBack/ErrorsBanner.nuxt.test.js
@@ -1,14 +1,15 @@
 import { describe, expect, test, vi } from "vitest"
-import { mount } from "@vue/test-utils"
+
 import { createTestingPinia } from "@pinia/testing"
+import { mount } from "@vue/test-utils"
 import { setActivePinia } from "pinia"
 
 import FeedBackErrorBanner from "@ogw_front/components/FeedBack/ErrorBanner"
 import { useFeedbackStore } from "@ogw_front/stores/feedback"
 import { vuetify } from "../../../utils"
 
-describe("FeedBackErrorBanner", async () => {
-  ;(test(`Test reload`, async () => {
+describe("FeedBackErrorBanner", () => {
+  test(`Test reload`, async () => {
     const pinia = createTestingPinia({
       stubActions: false,
       createSpy: vi.fn,
@@ -26,28 +27,29 @@ describe("FeedBackErrorBanner", async () => {
     const v_btn = wrapper.findAll(".v-btn")
     await v_btn[0].trigger("click")
     expect(reload_spy).toHaveBeenCalledTimes(1)
-  }),
-    test(`Test delete error`, async () => {
-      const wrapper = mount(FeedBackErrorBanner, {
-        global: {
-          plugins: [
-            createTestingPinia({
-              initialState: {
-                feedback: {
-                  server_error: true,
-                },
+  })
+
+  test(`Test delete error`, async () => {
+    const wrapper = mount(FeedBackErrorBanner, {
+      global: {
+        plugins: [
+          createTestingPinia({
+            initialState: {
+              feedback: {
+                server_error: true,
               },
-              stubActions: false,
-              createSpy: vi.fn,
-            }),
-            vuetify,
-          ],
-        },
-      })
+            },
+            stubActions: false,
+            createSpy: vi.fn,
+          }),
+          vuetify,
+        ],
+      },
+    })
 
-      const feedbackStore = useFeedbackStore()
-      const v_btn = wrapper.findAll(".v-btn")
-      await v_btn[1].trigger("click")
-      expect(feedbackStore.server_error).toBe(false)
-    }))
+    const feedbackStore = useFeedbackStore()
+    const v_btn = wrapper.findAll(".v-btn")
+    await v_btn[1].trigger("click")
+    expect(feedbackStore.server_error).toBe(false)
+  })
 })
diff --git a/tests/unit/components/FeedBack/Snackers.nuxt.test.js b/tests/unit/components/FeedBack/Snackers.nuxt.test.js
index 4a609a7c..82e52f65 100644
--- a/tests/unit/components/FeedBack/Snackers.nuxt.test.js
+++ b/tests/unit/components/FeedBack/Snackers.nuxt.test.js
@@ -1,15 +1,16 @@
 // @vitest-environment nuxt
-vi.stubGlobal("visualViewport", new EventTarget())
+import * as components from "vuetify/components"
 import { describe, expect, test, vi } from "vitest"
+import { createTestingPinia } from "@pinia/testing"
 import { mount } from "@vue/test-utils"
-import * as components from "vuetify/components"
 import { setActivePinia } from "pinia"
-import { createTestingPinia } from "@pinia/testing"
 
 import FeedBackSnackers from "@ogw_front/components/FeedBack/Snackers"
 import { useFeedbackStore } from "@ogw_front/stores/feedback"
 import { vuetify } from "../../../utils"
 
+vi.stubGlobal("visualViewport", new EventTarget())
+
 describe("FeedBackSnackers", async () => {
   test(`Test delete error`, async () => {
     const pinia = createTestingPinia({
diff --git a/tests/unit/components/FileSelector.nuxt.test.js b/tests/unit/components/FileSelector.nuxt.test.js
index 5f9899b6..8ea80770 100644
--- a/tests/unit/components/FileSelector.nuxt.test.js
+++ b/tests/unit/components/FileSelector.nuxt.test.js
@@ -1,10 +1,10 @@
+import * as components from "vuetify/components"
 import { describe, expect, test, vi } from "vitest"
-import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
+import { mountSuspended, registerEndpoint } from "@nuxt/test-utils/runtime"
 import { flushPromises } from "@vue/test-utils"
-import * as components from "vuetify/components"
 
-import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
+import { setActivePinia } from "pinia"
 
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 
@@ -13,10 +13,14 @@ import FileUploader from "@ogw_front/components/FileUploader"
 import { useGeodeStore } from "@ogw_front/stores/geode"
 import { vuetify } from "../../utils"
 
+const EXPECTED_LENGTH = 1
+const FIRST_INDEX = 0
+const SECOND_INDEX = 1
+
 const allowed_files_schema = schemas.opengeodeweb_back.allowed_files
 const upload_file_schema = schemas.opengeodeweb_back.upload_file
 
-describe("FileSelector", async () => {
+describe(FileSelector, async () => {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
@@ -27,7 +31,7 @@ describe("FileSelector", async () => {
 
   test(`Select file`, async () => {
     registerEndpoint(allowed_files_schema.$id, {
-      method: allowed_files_schema.methods[0],
+      method: allowed_files_schema.methods[FIRST_INDEX],
       handler: () => ({
         extensions: ["1", "2", "3"],
       }),
@@ -42,7 +46,7 @@ describe("FileSelector", async () => {
     const file_uploader = wrapper.findComponent(FileUploader)
 
     registerEndpoint(upload_file_schema.$id, {
-      method: upload_file_schema.methods[1],
+      method: upload_file_schema.methods[SECOND_INDEX],
       handler: () => ({}),
     })
 
@@ -59,23 +63,23 @@ describe("FileSelector", async () => {
     await flushPromises()
     await flushPromises()
     expect(wrapper.emitted()).toHaveProperty("update_values")
-    expect(wrapper.emitted().update_values).toHaveLength(1)
-    expect(wrapper.emitted().update_values[0][0]).toEqual({
+    expect(wrapper.emitted().update_values).toHaveLength(EXPECTED_LENGTH)
+    expect(wrapper.emitted().update_values[FIRST_INDEX][FIRST_INDEX]).toEqual({
       files,
       auto_upload,
     })
   })
 
-  describe(`Files prop`, () => {
+  describe(FileSelector, () => {
     registerEndpoint(allowed_files_schema.$id, {
-      method: allowed_files_schema.methods[0],
+      method: allowed_files_schema.methods[FIRST_INDEX],
       handler: () => ({
         extensions: ["1", "2", "3"],
       }),
     })
 
     registerEndpoint(upload_file_schema.$id, {
-      method: upload_file_schema.methods[1],
+      method: upload_file_schema.methods[SECOND_INDEX],
       handler: () => ({}),
     })
 
@@ -93,13 +97,15 @@ describe("FileSelector", async () => {
       })
 
       await flushPromises()
-      expect(wrapper.componentVM.props.files).toEqual(files)
+      expect(wrapper.componentVM.files).toEqual(files)
       expect(wrapper.emitted()).toHaveProperty("update_values")
-      expect(wrapper.emitted().update_values).toHaveLength(1)
-      expect(wrapper.emitted().update_values[0][0]).toEqual({
-        files,
-        auto_upload: false,
-      })
+      expect(wrapper.emitted().update_values).toHaveLength(EXPECTED_LENGTH)
+      expect(wrapper.emitted().update_values[FIRST_INDEX][FIRST_INDEX]).toEqual(
+        {
+          files,
+          auto_upload: false,
+        },
+      )
     })
 
     test("auto_upload false", async () => {
@@ -117,7 +123,7 @@ describe("FileSelector", async () => {
       await flushPromises()
 
       const file_uploader = wrapper.findComponent(FileUploader)
-      expect(wrapper.vm.props.files).toEqual(files)
+      expect(wrapper.vm.files).toEqual(files)
       const upload_files = vi.spyOn(file_uploader.vm, "upload_files")
       expect(upload_files).not.toHaveBeenCalled()
     })
diff --git a/tests/unit/components/FileUploader.nuxt.test.js b/tests/unit/components/FileUploader.nuxt.test.js
index b0e06777..142cd0e6 100644
--- a/tests/unit/components/FileUploader.nuxt.test.js
+++ b/tests/unit/components/FileUploader.nuxt.test.js
@@ -1,9 +1,10 @@
+import * as components from "vuetify/components"
 import { describe, expect, test, vi } from "vitest"
-import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
+import { mountSuspended, registerEndpoint } from "@nuxt/test-utils/runtime"
 import { flushPromises } from "@vue/test-utils"
-import * as components from "vuetify/components"
-import { setActivePinia } from "pinia"
+
 import { createTestingPinia } from "@pinia/testing"
+import { setActivePinia } from "pinia"
 
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 
@@ -12,9 +13,12 @@ import { useGeodeStore } from "@ogw_front/stores/geode"
 
 import { vuetify } from "../../utils"
 
+const FIRST_INDEX = 0
+const SECOND_INDEX = 1
+
 const upload_file_schema = schemas.opengeodeweb_back.upload_file
 
-describe("FileUploader", async () => {
+describe(FileUploader, async () => {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
@@ -24,11 +28,11 @@ describe("FileUploader", async () => {
   geodeStore.base_url = ""
 
   registerEndpoint(upload_file_schema.$id, {
-    method: upload_file_schema.methods[0],
+    method: upload_file_schema.methods[FIRST_INDEX],
     handler: () => ({}),
   })
   registerEndpoint(upload_file_schema.$id, {
-    method: upload_file_schema.methods[1],
+    method: upload_file_schema.methods[SECOND_INDEX],
     handler: () => ({}),
   })
 
@@ -54,7 +58,9 @@ describe("FileUploader", async () => {
       await v_btn.trigger("click")
       await flushPromises()
       await flushPromises()
-      expect(wrapper.emitted().files_uploaded[0][0]).toEqual(files)
+      expect(
+        wrapper.emitted().files_uploaded[FIRST_INDEX][FIRST_INDEX],
+      ).toEqual(files)
     })
 
     test(`prop auto_upload true`, async () => {
@@ -65,7 +71,9 @@ describe("FileUploader", async () => {
         props: { multiple: false, accept: "*.txt", files, auto_upload: true },
       })
       await flushPromises()
-      expect(wrapper.emitted().files_uploaded[0][0]).toEqual(files)
+      expect(
+        wrapper.emitted().files_uploaded[FIRST_INDEX][FIRST_INDEX],
+      ).toEqual(files)
     })
   })
 })
diff --git a/tests/unit/components/Inspector/InspectionButton.nuxt.test.js b/tests/unit/components/Inspector/InspectionButton.nuxt.test.js
index 1a9fff74..3865e7a7 100644
--- a/tests/unit/components/Inspector/InspectionButton.nuxt.test.js
+++ b/tests/unit/components/Inspector/InspectionButton.nuxt.test.js
@@ -1,17 +1,14 @@
+import * as components from "vuetify/components"
 import { describe, expect, test, vi } from "vitest"
-import { mountSuspended } from "@nuxt/test-utils/runtime"
+import { createTestingPinia } from "@pinia/testing"
 import { flushPromises } from "@vue/test-utils"
-import * as components from "vuetify/components"
+import { mountSuspended } from "@nuxt/test-utils/runtime"
 import { setActivePinia } from "pinia"
-import { createTestingPinia } from "@pinia/testing"
 
-import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import InspectorInspectionButton from "@ogw_front/components/Inspector/InspectionButton"
 import { useGeodeStore } from "@ogw_front/stores/geode"
 import { vuetify } from "../../../utils"
 
-const schema = schemas.opengeodeweb_back.inspect_file
-
 describe("Inspector/InspectionButton", async () => {
   const pinia = createTestingPinia({
     stubActions: false,
@@ -22,7 +19,7 @@ describe("Inspector/InspectionButton", async () => {
   geodeStore.base_url = ""
 
   test(`Test with issues`, async () => {
-    var inspection_result = {
+    const inspection_result = {
       title: "Brep inspection",
       nb_issues: 3,
       children: [
@@ -39,7 +36,7 @@ describe("Inspector/InspectionButton", async () => {
       ],
     }
 
-    geodeStore.request = vi.fn((schema, params, callbacks) => {
+    geodeStore.request = vi.fn((_schema, params, callbacks) => {
       if (callbacks?.response_function) {
         callbacks.response_function({
           inspection_result,
diff --git a/tests/unit/components/Inspector/ResultPanel.nuxt.test.js b/tests/unit/components/Inspector/ResultPanel.nuxt.test.js
index a93c1470..6874a332 100644
--- a/tests/unit/components/Inspector/ResultPanel.nuxt.test.js
+++ b/tests/unit/components/Inspector/ResultPanel.nuxt.test.js
@@ -22,7 +22,7 @@ describe("Inspector/ResultPanel", async () => {
     })
 
     expect(wrapper.exists()).toBe(true)
-    expect(wrapper.componentVM.props.inspection_result).toStrictEqual(
+    expect(wrapper.componentVM.inspection_result).toStrictEqual(
       inspection_result,
     )
 
@@ -30,7 +30,7 @@ describe("Inspector/ResultPanel", async () => {
       await wrapper.findComponent(InspectorResultPanel)
     expect(child_result_panel_wrapper.exists()).toBe(true)
     expect(
-      child_result_panel_wrapper.componentVM.props.inspection_result,
+      child_result_panel_wrapper.componentVM.inspection_result,
     ).toStrictEqual(inspection_result[0].children)
   })
 
@@ -52,7 +52,7 @@ describe("Inspector/ResultPanel", async () => {
 
     console.log({ wrapper })
 
-    expect(wrapper.componentVM.props.inspection_result).toStrictEqual(
+    expect(wrapper.componentVM.inspection_result).toStrictEqual(
       inspection_result,
     )
   })
diff --git a/tests/unit/components/Launcher.nuxt.test.js b/tests/unit/components/Launcher.nuxt.test.js
index 22667e95..9ccf972c 100644
--- a/tests/unit/components/Launcher.nuxt.test.js
+++ b/tests/unit/components/Launcher.nuxt.test.js
@@ -1,18 +1,19 @@
 import { describe, expect, test, vi } from "vitest"
+
+import Launcher from "@ogw_front/components/Launcher"
+import ResizeObserver from "resize-observer-polyfill"
+import { createTestingPinia } from "@pinia/testing"
 import { flushPromises } from "@vue/test-utils"
 import { mountSuspended } from "@nuxt/test-utils/runtime"
 import { setActivePinia } from "pinia"
-import { createTestingPinia } from "@pinia/testing"
-
-import Launcher from "@ogw_front/components/Launcher"
 
 import { useInfraStore } from "@ogw_front/stores/infra"
 import { vuetify } from "../../utils"
 
 // Mock navigator.locks API
-const mockLockRequest = vi.fn().mockImplementation(async (name, callback) => {
-  return callback({ name })
-})
+const mockLockRequest = vi
+  .fn()
+  .mockImplementation(async (name, task) => await task({ name }))
 
 vi.stubGlobal("navigator", {
   ...navigator,
@@ -21,9 +22,9 @@ vi.stubGlobal("navigator", {
   },
 })
 
-global.ResizeObserver = require("resize-observer-polyfill")
+global.ResizeObserver = ResizeObserver
 
-describe("Launcher", async () => {
+describe(Launcher, async () => {
   test(`Mount`, async () => {
     const pinia = createTestingPinia({
       stubActions: false,
@@ -36,7 +37,7 @@ describe("Launcher", async () => {
         plugins: [pinia, vuetify],
       },
     })
-    expect(wrapper.exists()).toBe(true)
+    expect(wrapper.exists()).toBeTruthy()
     await infraStore.$patch({ is_captcha_validated: true })
     await flushPromises()
     expect(infraStore.create_backend).toHaveBeenCalled()
diff --git a/tests/unit/components/MissingFilesSelector.nuxt.test.js b/tests/unit/components/MissingFilesSelector.nuxt.test.js
index 6534982f..c650853d 100644
--- a/tests/unit/components/MissingFilesSelector.nuxt.test.js
+++ b/tests/unit/components/MissingFilesSelector.nuxt.test.js
@@ -1,22 +1,25 @@
+import * as components from "vuetify/components"
 import { describe, expect, test, vi } from "vitest"
-import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
+import { mountSuspended, registerEndpoint } from "@nuxt/test-utils/runtime"
+import { createTestingPinia } from "@pinia/testing"
 import { flushPromises } from "@vue/test-utils"
-import * as components from "vuetify/components"
 import { setActivePinia } from "pinia"
-import { createTestingPinia } from "@pinia/testing"
 
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 
-import MissingFilesSelector from "@ogw_front/components/MissingFilesSelector"
 import FileUploader from "@ogw_front/components/FileUploader"
+import MissingFilesSelector from "@ogw_front/components/MissingFilesSelector"
 import { useGeodeStore } from "@ogw_front/stores/geode"
 
 import { vuetify } from "../../utils"
 
-const missing_files_schema = schemas.opengeodeweb_back.missing_files
+const EXPECTED_LENGTH = 1
+const FIRST_INDEX = 0
+const SECOND_INDEX = 1
+
 const upload_file_schema = schemas.opengeodeweb_back.upload_file
 
-describe("MissingFilesSelector", async () => {
+describe(MissingFilesSelector, () => {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
@@ -53,7 +56,7 @@ describe("MissingFilesSelector", async () => {
     })
 
     const file_uploader = wrapper.findComponent(FileUploader)
-    expect(file_uploader.exists()).toBe(true)
+    expect(file_uploader.exists()).toBeTruthy()
 
     const v_file_input = file_uploader.find('input[type="file"]')
     const files = [new File(["fake_file"], "fake_file.txt")]
@@ -65,17 +68,17 @@ describe("MissingFilesSelector", async () => {
     const v_btn = file_uploader.findComponent(components.VBtn)
 
     registerEndpoint(upload_file_schema.$id, {
-      method: upload_file_schema.methods[1],
+      method: upload_file_schema.methods[SECOND_INDEX],
       handler: () => ({}),
     })
     await v_btn.trigger("click")
     await flushPromises()
     await flushPromises()
     expect(wrapper.emitted()).toHaveProperty("update_values")
-    expect(wrapper.emitted().update_values).toHaveLength(1)
-    expect(wrapper.emitted().update_values[0][0]).toEqual({
+    expect(wrapper.emitted().update_values).toHaveLength(EXPECTED_LENGTH)
+    expect(wrapper.emitted().update_values[FIRST_INDEX][FIRST_INDEX]).toEqual({
       additional_files: files,
     })
-    expect(wrapper.emitted().increment_step).toHaveLength(1)
+    expect(wrapper.emitted().increment_step).toHaveLength(EXPECTED_LENGTH)
   })
 })
diff --git a/tests/unit/components/ObjectSelector.nuxt.test.js b/tests/unit/components/ObjectSelector.nuxt.test.js
index aa052472..6921e961 100644
--- a/tests/unit/components/ObjectSelector.nuxt.test.js
+++ b/tests/unit/components/ObjectSelector.nuxt.test.js
@@ -1,18 +1,24 @@
+import * as components from "vuetify/components"
 import { describe, expect, test, vi } from "vitest"
-import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
+import { mountSuspended, registerEndpoint } from "@nuxt/test-utils/runtime"
+import { createTestingPinia } from "@pinia/testing"
 import { flushPromises } from "@vue/test-utils"
-import * as components from "vuetify/components"
 import { setActivePinia } from "pinia"
-import { createTestingPinia } from "@pinia/testing"
 
-import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import ObjectSelector from "@ogw_front/components/ObjectSelector"
+import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import { useGeodeStore } from "@ogw_front/stores/geode"
 import { vuetify } from "../../utils"
 
-const allowed_objects = schemas.opengeodeweb_back.allowed_objects
+const EXPECTED_LENGTH = 1
+const FIRST_INDEX = 0
+const LOADABLE_SCORE = 1
+const PRIORITY_1 = 1
+const PRIORITY_2 = 2
+
+const { allowed_objects } = schemas.opengeodeweb_back
 
-describe("ObjectSelector", async () => {
+describe(ObjectSelector, () => {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
@@ -22,13 +28,13 @@ describe("ObjectSelector", async () => {
   geodeStore.base_url = ""
 
   test(`test loadable with one class`, async () => {
-    var response = {
+    const response = {
       allowed_objects: {},
     }
     const geode_object_1 = "BRep"
     response["allowed_objects"][geode_object_1] = { is_loadable: true }
     registerEndpoint(allowed_objects.$id, {
-      method: allowed_objects.methods[0],
+      method: allowed_objects.methods[FIRST_INDEX],
       handler: () => response,
     })
     const wrapper = await mountSuspended(ObjectSelector, {
@@ -41,15 +47,15 @@ describe("ObjectSelector", async () => {
     const v_img = v_card.findComponent(components.VImg)
     expect(v_img.vm.src).toContain(`${geode_object_1}.svg`)
     expect(wrapper.emitted()).toHaveProperty("update_values")
-    expect(wrapper.emitted().update_values).toHaveLength(1)
-    expect(wrapper.emitted().update_values[0][0]).toEqual({
+    expect(wrapper.emitted().update_values).toHaveLength(EXPECTED_LENGTH)
+    expect(wrapper.emitted().update_values[FIRST_INDEX][FIRST_INDEX]).toEqual({
       geode_object_type: geode_object_1,
     })
     wrapper.unmount()
   })
 
   test(`test loabable with multiple classes`, async () => {
-    var response = {
+    const response = {
       allowed_objects: {},
     }
     const geode_object_1 = "BRep"
@@ -57,7 +63,7 @@ describe("ObjectSelector", async () => {
     response["allowed_objects"][geode_object_1] = { is_loadable: true }
     response["allowed_objects"][geode_object_2] = { is_loadable: true }
     registerEndpoint(allowed_objects.$id, {
-      method: allowed_objects.methods[0],
+      method: allowed_objects.methods[FIRST_INDEX],
       handler: () => response,
     })
     const wrapper = await mountSuspended(ObjectSelector, {
@@ -73,31 +79,27 @@ describe("ObjectSelector", async () => {
     await v_card.trigger("click")
     await flushPromises()
     expect(wrapper.emitted()).toHaveProperty("update_values")
-    console.log(
-      "wrapper.emitted().update_values",
-      wrapper.emitted().update_values,
-    )
-    expect(wrapper.emitted().update_values).toHaveLength(1)
-    expect(wrapper.emitted().update_values[0][0]).toEqual({
+    expect(wrapper.emitted().update_values).toHaveLength(EXPECTED_LENGTH)
+    expect(wrapper.emitted().update_values[FIRST_INDEX][FIRST_INDEX]).toEqual({
       geode_object_type: geode_object_1,
     })
     wrapper.unmount()
   })
 
   test(`test object_priority when is_loadable scores equal`, async () => {
-    var response = { allowed_objects: {} }
+    const response = { allowed_objects: {} }
     const geode_object_1 = "BRep"
     const geode_object_2 = "EdgedCurve3D"
     response["allowed_objects"][geode_object_1] = {
-      is_loadable: 1.0,
-      object_priority: 2,
+      is_loadable: LOADABLE_SCORE,
+      object_priority: PRIORITY_2,
     }
     response["allowed_objects"][geode_object_2] = {
-      is_loadable: 1.0,
-      object_priority: 1,
+      is_loadable: LOADABLE_SCORE,
+      object_priority: PRIORITY_1,
     }
     registerEndpoint(allowed_objects.$id, {
-      method: allowed_objects.methods[0],
+      method: allowed_objects.methods[FIRST_INDEX],
       handler: () => response,
     })
     const wrapper = await mountSuspended(ObjectSelector, {
@@ -109,8 +111,8 @@ describe("ObjectSelector", async () => {
 
     await flushPromises()
     expect(wrapper.emitted()).toHaveProperty("update_values")
-    expect(wrapper.emitted().update_values).toHaveLength(1)
-    expect(wrapper.emitted().update_values[0][0]).toEqual({
+    expect(wrapper.emitted().update_values).toHaveLength(EXPECTED_LENGTH)
+    expect(wrapper.emitted().update_values[FIRST_INDEX][FIRST_INDEX]).toEqual({
       geode_object_type: geode_object_1,
     })
     wrapper.unmount()
diff --git a/tests/unit/components/PackagesVersions.nuxt.test.js b/tests/unit/components/PackagesVersions.nuxt.test.js
index 55e57977..45985e73 100644
--- a/tests/unit/components/PackagesVersions.nuxt.test.js
+++ b/tests/unit/components/PackagesVersions.nuxt.test.js
@@ -1,13 +1,15 @@
 import { describe, expect, test, vi } from "vitest"
 import { mountSuspended, registerEndpoint } from "@nuxt/test-utils/runtime"
-import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
+import { setActivePinia } from "pinia"
 
 import PackagesVersions from "@ogw_front/components/PackagesVersions"
 import { useGeodeStore } from "@ogw_front/stores/geode"
 import { vuetify } from "../../utils"
 
-describe("PackagesVersions", async () => {
+const FIRST_INDEX = 0
+
+describe(PackagesVersions, async () => {
   test(`Mount`, async () => {
     const pinia = createTestingPinia({
       createSpy: vi.fn,
@@ -24,7 +26,7 @@ describe("PackagesVersions", async () => {
       additionalProperties: false,
     }
     registerEndpoint(schema.$id, {
-      method: schema.methods[0],
+      method: schema.methods[FIRST_INDEX],
       handler: () => ({
         versions: [
           {
@@ -40,6 +42,6 @@ describe("PackagesVersions", async () => {
       },
       props: { schema },
     })
-    expect(wrapper.exists()).toBe(true)
+    expect(wrapper.exists()).toBeTruthy()
   })
 })
diff --git a/tests/unit/components/Step.nuxt.test.js b/tests/unit/components/Step.nuxt.test.js
index 738ccb30..f5db96c8 100644
--- a/tests/unit/components/Step.nuxt.test.js
+++ b/tests/unit/components/Step.nuxt.test.js
@@ -1,13 +1,16 @@
+import { computed, reactive, ref, shallowRef } from "vue"
 import { describe, expect, test } from "vitest"
+import ResizeObserver from "resize-observer-polyfill"
 import { mount } from "@vue/test-utils"
-import Step from "@ogw_front/components/Step"
+
 import ObjectSelector from "@ogw_front/components/ObjectSelector"
+import Step from "@ogw_front/components/Step"
 
 import { vuetify } from "../../utils"
 
-global.ResizeObserver = require("resize-observer-polyfill")
+global.ResizeObserver = ResizeObserver
 
-describe("Step", async () => {
+describe(Step, () => {
   test(`BRep`, async () => {
     const geode_object_type = ref("BRep")
     const files = ref([])
@@ -20,9 +23,7 @@ describe("Step", async () => {
           component: {
             component_name: shallowRef(ObjectSelector),
             component_options: {
-              filenames: computed(() => {
-                return files.value.map((file) => file.name)
-              }),
+              filenames: computed(() => files.value.map((file) => file.name)),
               key: "",
             },
           },
@@ -43,6 +44,6 @@ describe("Step", async () => {
       },
       props: { step_index: 0 },
     })
-    expect(wrapper.exists()).toBe(true)
+    expect(wrapper.exists()).toBeTruthy()
   })
 })
diff --git a/tests/unit/components/Stepper.nuxt.test.js b/tests/unit/components/Stepper.nuxt.test.js
index 5faead4e..950f367c 100644
--- a/tests/unit/components/Stepper.nuxt.test.js
+++ b/tests/unit/components/Stepper.nuxt.test.js
@@ -1,19 +1,22 @@
+import { computed, reactive, ref, shallowRef } from "vue"
 import { describe, expect, test } from "vitest"
-import { mountSuspended } from "@vue/test-utils"
 
-import Stepper from "@ogw_front/components/Stepper"
 import ObjectSelector from "@ogw_front/components/ObjectSelector"
+import ResizeObserver from "resize-observer-polyfill"
+import Stepper from "@ogw_front/components/Stepper"
 import { mountSuspended } from "@nuxt/test-utils/runtime"
 import { vuetify } from "../../utils"
 
-global.ResizeObserver = require("resize-observer-polyfill")
+const FIRST_INDEX = 0
+
+global.ResizeObserver = ResizeObserver
 
-describe("Stepper", async () => {
+describe(Stepper, () => {
   test(`Mount`, async () => {
     const geode_object_type = ref("BRep")
     const files = ref([])
     const stepper_tree = reactive({
-      current_step_index: ref(0),
+      current_step_index: ref(FIRST_INDEX),
       geode_object_type,
       steps: [
         {
@@ -21,18 +24,15 @@ describe("Stepper", async () => {
           component: {
             component_name: shallowRef(ObjectSelector),
             component_options: {
-              filenames: computed(() => {
-                return files.value.map((file) => file.name)
-              }),
+              filenames: computed(() => files.value.map((file) => file.name)),
               key: "",
             },
           },
           chips: computed(() => {
             if (geode_object_type.value === "") {
               return []
-            } else {
-              return [geode_object_type.value]
             }
+            return [geode_object_type.value]
           }),
         },
       ],
@@ -43,6 +43,6 @@ describe("Stepper", async () => {
         provide: { stepper_tree },
       },
     })
-    expect(wrapper.exists()).toBe(true)
+    expect(wrapper.exists()).toBeTruthy()
   })
 })
diff --git a/tests/unit/composables/ProjectManager.nuxt.test.js b/tests/unit/composables/ProjectManager.nuxt.test.js
index 50fec451..d8517cbb 100644
--- a/tests/unit/composables/ProjectManager.nuxt.test.js
+++ b/tests/unit/composables/ProjectManager.nuxt.test.js
@@ -1,10 +1,32 @@
-import { beforeEach, describe, expect, test, vi } from "vitest"
-import { setActivePinia } from "pinia"
+import { describe, expect, test, vi } from "vitest"
 import { createTestingPinia } from "@pinia/testing"
+import { setActivePinia } from "pinia"
 
 // Local imports
-import { useProjectManager } from "@ogw_front/composables/project_manager"
 import { appMode } from "@ogw_front/utils/app_mode"
+import { useProjectManager } from "@ogw_front/composables/project_manager"
+
+// Constants
+const PANEL_WIDTH = 300
+const Z_SCALE = 1.5
+const FOCAL_POINT1 = 1
+const FOCAL_POINT2 = 2
+const FOCAL_POINT3 = 3
+const FOCAL_POINT = [FOCAL_POINT1, FOCAL_POINT2, FOCAL_POINT3]
+const VIEW_UP1 = 0
+const VIEW_UP2 = 1
+const VIEW_UP3 = 0
+const VIEW_UP = [VIEW_UP1, VIEW_UP2, VIEW_UP3]
+const POSITION1 = 10
+const POSITION2 = 11
+const POSITION3 = 12
+const POSITION = [POSITION1, POSITION2, POSITION3]
+const VIEW_ANGLE = 30
+const CLIPPING_RANGE1 = 0.1
+const CLIPPING_RANGE2 = 1000
+const CLIPPING_RANGE = [CLIPPING_RANGE1, CLIPPING_RANGE2]
+const POINT_SIZE = 2
+const VIEWER_CALL_COUNT = 2
 
 // Snapshot
 const snapshotMock = {
@@ -23,10 +45,10 @@ const snapshotMock = {
   },
   treeview: {
     isAdditionnalTreeDisplayed: false,
-    panelWidth: 320,
+    panelWidth: PANEL_WIDTH,
     model_id: "",
     isTreeCollection: false,
-    selectedTree: null,
+    selectedTree: undefined,
     selectionIds: [],
   },
   dataStyle: {
@@ -37,21 +59,21 @@ const snapshotMock = {
           coloring: {
             active: "color",
             color: { r: 255, g: 255, b: 255 },
-            vertex: null,
+            vertex: undefined,
           },
-          size: 2,
+          size: POINT_SIZE,
         },
       },
     },
   },
   hybridViewer: {
-    zScale: 1.5,
+    zScale: Z_SCALE,
     camera_options: {
-      focal_point: [1, 2, 3],
-      view_up: [0, 1, 0],
-      position: [10, 11, 12],
-      view_angle: 30,
-      clipping_range: [0.1, 1000],
+      focal_point: FOCAL_POINT,
+      view_up: VIEW_UP,
+      position: POSITION,
+      view_angle: VIEW_ANGLE,
+      clipping_range: CLIPPING_RANGE,
     },
   },
 }
@@ -67,56 +89,54 @@ const infraStoreMock = {
   ID: "1234",
 }
 const viewerStoreMock = {
-  ws_connect: vi.fn(() => Promise.resolve()),
+  ws_connect: vi.fn().mockResolvedValue(),
   base_url: vi.fn(() => ""),
-  request: vi.fn(() => Promise.resolve()),
+  request: vi.fn().mockResolvedValue(),
 }
 const treeviewStoreMock = {
   clear: vi.fn(),
-  importStores: vi.fn(() => Promise.resolve()),
+  importStores: vi.fn().mockResolvedValue(),
   finalizeImportSelection: vi.fn(),
-  addItem: vi.fn(() => Promise.resolve()),
+  addItem: vi.fn().mockResolvedValue(),
 }
 const dataStoreMock = {
   clear: vi.fn(),
-  registerObject: vi.fn(() => Promise.resolve()),
-  addItem: vi.fn(() => Promise.resolve()),
+  registerObject: vi.fn().mockResolvedValue(),
+  addItem: vi.fn().mockResolvedValue(),
 }
 const dataStyleStoreMock = {
-  importStores: vi.fn(() => Promise.resolve()),
-  applyAllStylesFromState: vi.fn(() => Promise.resolve()),
-  addDataStyle: vi.fn(() => Promise.resolve()),
-  applyDefaultStyle: vi.fn(() => Promise.resolve()),
+  importStores: vi.fn().mockResolvedValue(),
+  applyAllStylesFromState: vi.fn().mockResolvedValue(),
+  addDataStyle: vi.fn().mockResolvedValue(),
+  applyDefaultStyle: vi.fn().mockResolvedValue(),
 }
+
+const viewer_call_mock_fn = vi.fn().mockResolvedValue()
+
 const hybridViewerStoreMock = {
   clear: vi.fn(),
-  initHybridViewer: vi.fn(() => Promise.resolve()),
-  importStores: vi.fn(async (snapshot) => {
-    if (snapshot?.zScale != null) {
+  initHybridViewer: vi.fn().mockResolvedValue(),
+  importStores: vi.fn((snapshot) => {
+    if (snapshot?.zScale !== undefined) {
       hybridViewerStoreMock.setZScaling(snapshot.zScale)
     }
     if (snapshot?.camera_options) {
-      const { viewer_call } =
-        await import("../../../internal/utils/viewer_call")
-      viewer_call({
+      viewer_call_mock_fn({
         schema: { $id: "opengeodeweb_viewer.viewer.update_camera" },
         params: { camera_options: snapshot.camera_options },
       })
       hybridViewerStoreMock.remoteRender()
     }
   }),
-  addItem: vi.fn(() => Promise.resolve()),
+  addItem: vi.fn().mockResolvedValue(),
   remoteRender: vi.fn(),
   setZScaling: vi.fn(),
 }
 
-// Mocks
-vi.stubGlobal(
-  "$fetch",
-  vi.fn(async () => ({ snapshot: snapshotMock })),
-)
+// MOCKS
+vi.stubGlobal("$fetch", vi.fn().mockResolvedValue({ snapshot: snapshotMock }))
 vi.mock("../../../internal/utils/viewer_call", () => ({
-  viewer_call: vi.fn(() => Promise.resolve()),
+  viewer_call: viewer_call_mock_fn,
 }))
 
 vi.mock("@ogw_front/composables/api_fetch", () => ({
@@ -124,7 +144,7 @@ vi.mock("@ogw_front/composables/api_fetch", () => ({
     const response = {
       _data: new Blob(["zipcontent"], { type: "application/zip" }),
       headers: {
-        get: (k) => (k === "new-file-name" ? "project_123.vease" : null),
+        get: (k) => (k === "new-file-name" ? "project_123.vease" : undefined),
       },
     }
     if (options.response_function) await options.response_function(response)
@@ -163,9 +183,9 @@ vi.stubGlobal("useAppStore", () => ({
   exportStores: vi.fn(() => ({ projectName: "mockedProject" })),
 }))
 
-const mockLockRequest = vi.fn().mockImplementation(async (name, callback) => {
-  return callback({ name })
-})
+const mockLockRequest = vi
+  .fn()
+  .mockImplementation(async (name, fn) => await fn({ name }))
 
 vi.stubGlobal("navigator", {
   ...navigator,
@@ -174,37 +194,89 @@ vi.stubGlobal("navigator", {
   },
 })
 
-describe("ProjectManager composable (compact)", () => {
-  beforeEach(async () => {
+function verifyViewerCalls() {
+  expect(viewerStoreMock.ws_connect).toHaveBeenCalledWith()
+  expect(viewer_call_mock_fn).toHaveBeenCalledTimes(VIEWER_CALL_COUNT)
+}
+
+function verifyStoreImports() {
+  expect(treeviewStoreMock.importStores).toHaveBeenCalledWith(
+    snapshotMock.treeview,
+  )
+  expect(hybridViewerStoreMock.initHybridViewer).toHaveBeenCalledWith()
+  expect(hybridViewerStoreMock.importStores).toHaveBeenCalledWith(
+    snapshotMock.hybridViewer,
+  )
+  expect(hybridViewerStoreMock.setZScaling).toHaveBeenCalledWith(Z_SCALE)
+}
+
+function verifyDataManagement() {
+  expect(dataStyleStoreMock.importStores).toHaveBeenCalledWith(
+    snapshotMock.dataStyle,
+  )
+  expect(dataStyleStoreMock.applyAllStylesFromState).toHaveBeenCalledWith()
+  expect(dataStoreMock.registerObject).toHaveBeenCalledWith("abc123")
+  expect(dataStoreMock.addItem).toHaveBeenCalledWith(
+    "abc123",
+    expect.anything(),
+  )
+  expect(treeviewStoreMock.addItem).toHaveBeenCalledWith(
+    "PointSet2D",
+    "My Data",
+    "abc123",
+    "mesh",
+  )
+}
+
+function verifyRemaining() {
+  expect(hybridViewerStoreMock.addItem).toHaveBeenCalledWith("abc123")
+  expect(dataStyleStoreMock.addDataStyle).toHaveBeenCalledWith(
+    "abc123",
+    "PointSet2D",
+  )
+  expect(dataStyleStoreMock.applyDefaultStyle).toHaveBeenCalledWith("abc123")
+  expect(hybridViewerStoreMock.remoteRender).toHaveBeenCalledWith()
+}
+
+describe("projectManager composable (compact)", () => {
+  function setup() {
     const pinia = createTestingPinia({ stubActions: false, createSpy: vi.fn })
     setActivePinia(pinia)
 
     // reset spies
-    for (const store of [
+    const storesList = [
       viewerStoreMock,
       treeviewStoreMock,
       dataStoreMock,
       dataStyleStoreMock,
       hybridViewerStoreMock,
-    ]) {
-      Object.values(store).forEach(
-        (v) => typeof v === "function" && v.mockClear && v.mockClear(),
-      )
+    ]
+    for (const store of storesList) {
+      const values = Object.values(store)
+      for (const value of values) {
+        if (typeof value === "function" && value.mockClear) {
+          value.mockClear()
+        }
+      }
     }
-    const { viewer_call } = await import("../../../internal/utils/viewer_call")
-    viewer_call.mockClear()
-  })
+    viewer_call_mock_fn.mockClear()
+  }
 
   test("exportProject", async () => {
+    setup()
     const { exportProject } = useProjectManager()
     const { default: fileDownload } = await import("js-file-download")
 
     await exportProject()
 
-    expect(fileDownload).toHaveBeenCalled()
+    expect(fileDownload).toHaveBeenCalledWith(
+      { snapshot: snapshotMock },
+      "project.vease",
+    )
   })
 
-  test("importProjectFile with snapshot", async () => {
+  test("importProjectFile with snapshot - Viewer and Stores", async () => {
+    setup()
     const { importProjectFile } = useProjectManager()
     const file = new Blob(['{"dataBase":{"db":{}}}'], {
       type: "application/json",
@@ -212,47 +284,22 @@ describe("ProjectManager composable (compact)", () => {
 
     await importProjectFile(file)
 
-    const { viewer_call } = await import("../../../internal/utils/viewer_call")
-
-    expect(viewerStoreMock.ws_connect).toHaveBeenCalled()
-    expect(viewer_call).toHaveBeenCalledTimes(2)
-
-    expect(treeviewStoreMock.importStores).toHaveBeenCalledWith(
-      snapshotMock.treeview,
-    )
-    expect(hybridViewerStoreMock.initHybridViewer).toHaveBeenCalled()
-    expect(hybridViewerStoreMock.importStores).toHaveBeenCalledWith(
-      snapshotMock.hybridViewer,
-    )
-    expect(hybridViewerStoreMock.setZScaling).toHaveBeenCalledWith(1.5)
+    verifyViewerCalls()
+    verifyStoreImports()
+    expect(true).toBeTruthy()
+  })
 
-    expect(dataStyleStoreMock.importStores).toHaveBeenCalledWith(
-      snapshotMock.dataStyle,
-    )
-    expect(dataStyleStoreMock.applyAllStylesFromState).toHaveBeenCalled()
+  test("importProjectFile with snapshot - Data and Rendering", async () => {
+    setup()
+    const { importProjectFile } = useProjectManager()
+    const file = new Blob(['{"dataBase":{"db":{}}}'], {
+      type: "application/json",
+    })
 
-    expect(dataStoreMock.registerObject).toHaveBeenCalledWith("abc123")
-    expect(dataStoreMock.addItem).toHaveBeenCalledWith(
-      "abc123",
-      expect.objectContaining({
-        viewer_type: "mesh",
-        geode_object_type: "PointSet2D",
-        name: "My Data",
-      }),
-    )
-    expect(treeviewStoreMock.addItem).toHaveBeenCalledWith(
-      "PointSet2D",
-      "My Data",
-      "abc123",
-      "mesh",
-    )
-    expect(hybridViewerStoreMock.addItem).toHaveBeenCalledWith("abc123")
-    expect(dataStyleStoreMock.addDataStyle).toHaveBeenCalledWith(
-      "abc123",
-      "PointSet2D",
-    )
-    expect(dataStyleStoreMock.applyDefaultStyle).toHaveBeenCalledWith("abc123")
+    await importProjectFile(file)
 
-    expect(hybridViewerStoreMock.remoteRender).toHaveBeenCalled()
+    verifyDataManagement()
+    verifyRemaining()
+    expect(true).toBeTruthy()
   })
 })
diff --git a/tests/unit/composables/api_fetch.nuxt.test.js b/tests/unit/composables/api_fetch.nuxt.test.js
index 3cd001ba..dea21711 100644
--- a/tests/unit/composables/api_fetch.nuxt.test.js
+++ b/tests/unit/composables/api_fetch.nuxt.test.js
@@ -1,20 +1,25 @@
-import { describe, expect, test, beforeEach, vi } from "vitest"
-import { setActivePinia } from "pinia"
+import { describe, expect, test, vi } from "vitest"
 import { createTestingPinia } from "@pinia/testing"
 import { registerEndpoint } from "@nuxt/test-utils/runtime"
+import { setActivePinia } from "pinia"
 
-import { useGeodeStore } from "@ogw_front/stores/geode"
 import { useFeedbackStore } from "@ogw_front/stores/feedback"
+import { useGeodeStore } from "@ogw_front/stores/geode"
+
+const FIRST_INDEX = 0
 
 describe("geodeStore.request()", () => {
-  const pinia = createTestingPinia({
-    stubActions: false,
-    createSpy: vi.fn,
-  })
-  setActivePinia(pinia)
-  const geodeStore = useGeodeStore()
-  const feedbackStore = useFeedbackStore()
-  geodeStore.base_url = ""
+  function setup() {
+    const pinia = createTestingPinia({
+      stubActions: false,
+      createSpy: vi.fn,
+    })
+    setActivePinia(pinia)
+    const geodeStore = useGeodeStore()
+    const feedbackStore = useFeedbackStore()
+    geodeStore.base_url = ""
+    return { geodeStore, feedbackStore }
+  }
 
   const schema = {
     $id: "/test",
@@ -29,19 +34,8 @@ describe("geodeStore.request()", () => {
     additionalProperties: false,
   }
 
-  beforeEach(async () => {
-    await feedbackStore.$reset()
-    await geodeStore.$reset()
-    geodeStore.base_url = ""
-  })
-
-  // test("valid schema and params", async () => {
-  //   const params = { test: "hello" }
-  //   const response = await api_fetch({ schema, params })
-  //   expect(response).toBeDefined()
-  // })
-
   test("invalid schema", async () => {
+    const { geodeStore } = setup()
     const schema = {
       $id: "/test",
       type: "object",
@@ -55,19 +49,21 @@ describe("geodeStore.request()", () => {
       additionalProperties: false,
     }
     const params = { test: "hello" }
-    expect(() => geodeStore.request(schema, params)).toThrowError(
+    expect(() => geodeStore.request(schema, params)).toThrow(
       "data/test must be number",
     )
   })
 
   test("invalid params", async () => {
+    const { geodeStore } = setup()
     const params = {}
-    expect(() => geodeStore.request(schema, params)).toThrowError(
+    expect(() => geodeStore.request(schema, params)).toThrow(
       "data must have required property 'test'",
     )
   })
 
   test("request with callbacks", async () => {
+    const { geodeStore } = setup()
     const params = { test: "hello" }
     let errorCalled = false
     const callbacks = {
@@ -76,30 +72,10 @@ describe("geodeStore.request()", () => {
       },
     }
     registerEndpoint(schema.$id, {
-      method: schema.methods[0],
+      method: schema.methods[FIRST_INDEX],
       handler: () => ({ result: "success" }),
     })
     await geodeStore.request(schema, params, callbacks)
-    expect(errorCalled).toBe(false)
+    expect(errorCalled).toBeFalsy()
   })
-
-  // test("response handling", async () => {
-  //   const schema = {
-  //     $id: "/test",
-  //     type: "object",
-  //     methods: ["POST"],
-  //     properties: {
-  //       test: {
-  //         type: "string",
-  //       },
-  //     },
-  //     required: ["test"],
-  //     additionalProperties: false,
-  //   }
-  //   const params = { test: "hello" }
-  //   // const responseFunction = jest.fn()
-  //   const response = await api_fetch({ schema, params }, { response_function })
-  //   expect(responseFunction).toHaveBeenCalledTimes(1)
-  //   expect(response).toBeDefined()
-  // })
 })
diff --git a/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js b/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js
index c9d88fe3..daaf704e 100644
--- a/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js
+++ b/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js
@@ -1,26 +1,24 @@
-import { beforeEach, describe, expect, test, vi } from "vitest"
+import { describe, expect, test, vi } from "vitest"
 import Status from "@ogw_front/utils/status"
+import { flushPromises } from "@vue/test-utils"
 
-import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
+import { setActivePinia } from "pinia"
 
 import { run_function_when_microservices_connected } from "@ogw_front/composables/run_function_when_microservices_connected"
-import { useInfraStore } from "@ogw_front/stores/infra"
 import { useGeodeStore } from "@ogw_front/stores/geode"
+import { useInfraStore } from "@ogw_front/stores/infra"
 import { useViewerStore } from "@ogw_front/stores/viewer"
 
-beforeEach(async () => {
-  const pinia = createTestingPinia({
-    stubActions: false,
-    createSpy: vi.fn,
-  })
-  setActivePinia(pinia)
-})
-
-describe("run_function_when_microservices_connected", () => {
+describe("when_microservices_connected_run_function", () => {
   const dumb_obj = { dumb_method: () => true }
 
-  beforeEach(async () => {
+  function setup() {
+    const pinia = createTestingPinia({
+      stubActions: false,
+      createSpy: vi.fn,
+    })
+    setActivePinia(pinia)
     const infraStore = useInfraStore()
     const geodeStore = useGeodeStore()
     const viewerStore = useViewerStore()
@@ -37,32 +35,18 @@ describe("run_function_when_microservices_connected", () => {
       launch: vi.fn(),
     })
 
-    await geodeStore.$patch({ status: Status.NOT_CONNECTED })
-    await viewerStore.$patch({ status: Status.NOT_CONNECTED })
-  })
+    geodeStore.$patch({ status: Status.NOT_CONNECTED })
+    viewerStore.$patch({ status: Status.NOT_CONNECTED })
 
-  test("microservices not connected", async () => {
-    const geodeStore = useGeodeStore()
-    const viewerStore = useViewerStore()
-    const infraStore = useInfraStore()
-    const spy = vi.spyOn(dumb_obj, "dumb_method")
-    run_function_when_microservices_connected(dumb_obj.dumb_method)
-    await geodeStore.$patch({ status: Status.NOT_CONNECTED })
-    await viewerStore.$patch({ status: Status.NOT_CONNECTED })
-    console.log("geodeStore", geodeStore.status)
-    console.log("viewerStore", viewerStore.status)
+    return { infraStore, geodeStore, viewerStore }
+  }
 
-    console.log("microservices_connected", infraStore.microservices_connected)
-    expect(spy).not.toHaveBeenCalled()
-  })
   test("microservices not connected", async () => {
-    const geodeStore = useGeodeStore()
-    const viewerStore = useViewerStore()
-    const infraStore = useInfraStore()
+    const { infraStore, geodeStore, viewerStore } = setup()
     const spy = vi.spyOn(dumb_obj, "dumb_method")
     run_function_when_microservices_connected(dumb_obj.dumb_method)
-    await geodeStore.$patch({ status: Status.NOT_CONNECTED })
-    await viewerStore.$patch({ status: Status.NOT_CONNECTED })
+    geodeStore.$patch({ status: Status.NOT_CONNECTED })
+    viewerStore.$patch({ status: Status.NOT_CONNECTED })
     console.log("geodeStore", geodeStore.status)
     console.log("viewerStore", viewerStore.status)
 
@@ -71,12 +55,12 @@ describe("run_function_when_microservices_connected", () => {
   })
 
   test("microservices connected", async () => {
-    const geodeStore = useGeodeStore()
-    const viewerStore = useViewerStore()
+    const { geodeStore, viewerStore } = setup()
     const spy = vi.spyOn(dumb_obj, "dumb_method")
     run_function_when_microservices_connected(dumb_obj.dumb_method)
-    await geodeStore.$patch({ status: Status.CONNECTED })
-    await viewerStore.$patch({ status: Status.CONNECTED })
-    expect(spy).toHaveBeenCalled()
+    geodeStore.$patch({ status: Status.CONNECTED })
+    viewerStore.$patch({ status: Status.CONNECTED })
+    await flushPromises()
+    expect(spy).toHaveBeenCalledWith()
   })
 })
diff --git a/tests/unit/composables/upload_file.nuxt.test.js b/tests/unit/composables/upload_file.nuxt.test.js
index 5f8231b0..9bab021f 100644
--- a/tests/unit/composables/upload_file.nuxt.test.js
+++ b/tests/unit/composables/upload_file.nuxt.test.js
@@ -1,44 +1,45 @@
-import { describe, expect, test, beforeEach, vi } from "vitest"
-import { setActivePinia } from "pinia"
+import { describe, expect, test, vi } from "vitest"
 import { createTestingPinia } from "@pinia/testing"
 import { registerEndpoint } from "@nuxt/test-utils/runtime"
-import upload_file from "@ogw_front/utils/upload_file"
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
+import { setActivePinia } from "pinia"
+import upload_file from "@ogw_front/utils/upload_file"
 import { useFeedbackStore } from "@ogw_front/stores/feedback"
-
 import { useGeodeStore } from "@ogw_front/stores/geode"
-const schema = schemas.opengeodeweb_back.upload_file
 
-beforeEach(async () => {
-  const pinia = createTestingPinia({
-    stubActions: false,
-    createSpy: vi.fn,
-  })
-  setActivePinia(pinia)
-})
+const ZERO = 0
+const schema = schemas.opengeodeweb_back.upload_file
 
-describe("upload_file", () => {
-  beforeEach(() => {
+describe("upload_file test", () => {
+  function setup() {
+    const pinia = createTestingPinia({
+      stubActions: false,
+      createSpy: vi.fn,
+    })
+    setActivePinia(pinia)
     const geodeStore = useGeodeStore()
     geodeStore.base_url = ""
-  })
+    const feedbackStore = useFeedbackStore()
+    return { geodeStore, feedbackStore }
+  }
 
-  test("Throw error", async () => {
-    var file = "toto"
+  test("throw error", async () => {
+    setup()
+    const file = "toto"
 
-    expect(async () => {
-      await upload_file({ route: schema.$id, file })
-    }).rejects.toThrowError("file must be a instance of File")
+    await expect(upload_file({ route: schema.$id, file })).rejects.toThrow(
+      "file must be a instance of File",
+    )
   })
 
   test("onResponse", async () => {
-    const feedbackStore = useFeedbackStore()
+    const { feedbackStore } = setup()
     registerEndpoint(schema.$id, {
       method: "PUT",
       handler: () => ({ test: "ok" }),
     })
-    var file = new File(["fake_file"], "fake_file.txt")
-    var response_value
+    const file = new File(["fake_file"], "fake_file.txt")
+    let response_value = ""
     await upload_file(
       { route: schema.$id, file },
       {
@@ -47,7 +48,7 @@ describe("upload_file", () => {
         },
       },
     )
-    expect(feedbackStore.feedbacks.length).toBe(0)
+    expect(feedbackStore.feedbacks).toHaveLength(ZERO)
     expect(response_value).toBe("ok")
   })
 })
diff --git a/tests/unit/plugins/project_load.nuxt.test.js b/tests/unit/plugins/project_load.nuxt.test.js
index 6cbe4e18..907346cd 100644
--- a/tests/unit/plugins/project_load.nuxt.test.js
+++ b/tests/unit/plugins/project_load.nuxt.test.js
@@ -1,40 +1,72 @@
-import { beforeEach, describe, expect, test, vi } from "vitest"
+import { describe, expect, test, vi } from "vitest"
 import { createTestingPinia } from "@pinia/testing"
 import { setActivePinia } from "pinia"
-import { database } from "../../../internal/database/database.js"
 
-import { useTreeviewStore } from "@ogw_front/stores/treeview"
 import { useAppStore } from "@ogw_front/stores/app"
+import { useDataStore } from "@ogw_front/stores/data"
 import { useDataStyleStore } from "@ogw_front/stores/data_style"
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
-import { useDataStore } from "@ogw_front/stores/data"
+import { useTreeviewStore } from "@ogw_front/stores/treeview"
+
+import { database } from "../../../internal/database/database.js"
+
+const PANEL_WIDTH = 320
+const Z_SCALE = 1.5
+const STORES_SLICE_START = 1
 
 vi.mock("../../../internal/utils/viewer_call", () => ({
-  viewer_call: vi.fn(() => Promise.resolve()),
+  viewer_call: vi.fn(async () => {
+    await Promise.resolve()
+  }),
 }))
 vi.mock("../../../app/stores/hybrid_viewer", () => ({
   useHybridViewerStore: () => ({
     $id: "hybridViewer",
-    initHybridViewer: vi.fn(),
-    clear: vi.fn(),
     addItem: vi.fn(),
-    setZScaling: vi.fn(),
-    save: vi.fn(),
+    clear: vi.fn(),
+    initHybridViewer: vi.fn(),
     load: vi.fn(),
+    save: vi.fn(),
+    setZScaling: vi.fn(),
   }),
 }))
 
-beforeEach(() => {
-  setActivePinia(
-    createTestingPinia({
-      stubActions: false,
-      createSpy: vi.fn,
-    }),
-  )
-})
+const snapshot = {
+  data: {
+    items: [
+      {
+        id: "abc123",
+        viewer_type: "mesh",
+        geode_object_type: "PointSet2D",
+        native_file: "native.ext",
+        viewable_file: "viewable.ext",
+        name: "My Data",
+        binary_light_viewable: "VGxpZ2h0RGF0YQ==",
+      },
+    ],
+  },
+  treeview: {
+    items: [{ title: "PointSet2D", children: [] }],
+    selection: [],
+    components_selection: [],
+    isAdditionnalTreeDisplayed: false,
+    panelWidth: PANEL_WIDTH,
+    model_id: "",
+    isTreeCollection: false,
+    selectedTree: undefined,
+  },
+  dataStyle: { styles: { abc123: { some: "style" } } },
+  hybridViewer: { zScale: Z_SCALE },
+}
 
-describe("Project import", () => {
-  test("app.importStores restores stores", async () => {
+describe("project import", () => {
+  function setup() {
+    setActivePinia(
+      createTestingPinia({
+        stubActions: false,
+        createSpy: vi.fn,
+      }),
+    )
     const stores = {
       app: useAppStore(),
       dataBase: useDataStore(),
@@ -42,46 +74,23 @@ describe("Project import", () => {
       dataStyle: useDataStyleStore(),
       hybrid: useHybridViewerStore(),
     }
-    Object.values(stores)
-      .slice(1)
-      .forEach((store) => stores.app.registerStore(store))
+    const storesArray = Object.values(stores)
+    for (const store of storesArray.slice(STORES_SLICE_START)) {
+      stores.app.registerStore(store)
+    }
+    return { stores }
+  }
+
+  test("app.importStores restores stores", async () => {
+    const { stores } = setup()
 
     vi.spyOn(stores.dataBase, "importStores").mockImplementation(
       async (snapshot) => {
-        for (const item of snapshot?.items || []) {
-          await database.data.put(item)
-        }
+        const { items } = snapshot
+        await Promise.all(items.map((item) => database.data.put(item)))
       },
     )
 
-    const snapshot = {
-      data: {
-        items: [
-          {
-            id: "abc123",
-            viewer_type: "mesh",
-            geode_object_type: "PointSet2D",
-            native_file: "native.ext",
-            viewable_file: "viewable.ext",
-            name: "My Data",
-            binary_light_viewable: "VGxpZ2h0RGF0YQ==",
-          },
-        ],
-      },
-      treeview: {
-        items: [{ title: "PointSet2D", children: [] }],
-        selection: [],
-        components_selection: [],
-        isAdditionnalTreeDisplayed: false,
-        panelWidth: 320,
-        model_id: "",
-        isTreeCollection: false,
-        selectedTree: null,
-      },
-      dataStyle: { styles: { abc123: { some: "style" } } },
-      hybridViewer: { zScale: 1.5 },
-    }
-
     await stores.app.importStores(snapshot)
 
     const item = await database.data.get("abc123")
diff --git a/tests/unit/stores/App.nuxt.test.js b/tests/unit/stores/App.nuxt.test.js
index 412cec11..2e599c27 100644
--- a/tests/unit/stores/App.nuxt.test.js
+++ b/tests/unit/stores/App.nuxt.test.js
@@ -1,20 +1,28 @@
-import { beforeEach, describe, expect, expectTypeOf, test, vi } from "vitest"
+import { describe, expect, expectTypeOf, test, vi } from "vitest"
 import { createTestingPinia } from "@pinia/testing"
 import { setActivePinia } from "pinia"
 
 import { useAppStore } from "@ogw_front/stores/app"
 
-beforeEach(async () => {
-  const pinia = createTestingPinia({
-    stubActions: false,
-    createSpy: vi.fn,
-  })
-  setActivePinia(pinia)
-})
+// Constants
+const SINGLE_STORE_LENGTH = 1
+const MULTIPLE_STORES_LENGTH = 2
+const FIRST_INDEX = 0
+const SECOND_INDEX = 1
+const CALL_COUNT_ONCE = 1
+
+describe("app store", () => {
+  function setup() {
+    const pinia = createTestingPinia({
+      stubActions: false,
+      createSpy: vi.fn,
+    })
+    setActivePinia(pinia)
+  }
 
-describe("App Store", () => {
   describe("state", () => {
     test("initial state", () => {
+      setup()
       const appStore = useAppStore()
       expectTypeOf(appStore.stores).toBeArray()
       expectTypeOf(appStore.exportStores).toBeFunction()
@@ -26,43 +34,46 @@ describe("App Store", () => {
   describe("actions", () => {
     describe("registerStore", () => {
       test("register single store", () => {
+        setup()
         const appStore = useAppStore()
         const mock_store = {
           $id: "testStore",
           save: vi.fn().mockImplementation(() => ({ data: "test" })),
-          load: vi.fn().mockImplementation(() => {}),
+          load: vi.fn().mockImplementation(),
         }
 
         appStore.registerStore(mock_store)
 
-        expect(appStore.stores.length).toBe(1)
-        expect(appStore.stores[0]).toStrictEqual(mock_store)
+        expect(appStore.stores).toHaveLength(SINGLE_STORE_LENGTH)
+        expect(appStore.stores[FIRST_INDEX]).toStrictEqual(mock_store)
       })
 
       test("register multiple stores", () => {
+        setup()
         const appStore = useAppStore()
         const mock_store_1 = {
           $id: "userStore",
-          save: vi.fn().mockImplementation(() => {}),
-          load: vi.fn().mockImplementation(() => {}),
+          save: vi.fn().mockImplementation(),
+          load: vi.fn().mockImplementation(),
         }
         const mock_store_2 = {
           $id: "geodeStore",
-          save: vi.fn().mockImplementation(() => {}),
-          load: vi.fn().mockImplementation(() => {}),
+          save: vi.fn().mockImplementation(),
+          load: vi.fn().mockImplementation(),
         }
 
         appStore.registerStore(mock_store_1)
         appStore.registerStore(mock_store_2)
 
-        expect(appStore.stores.length).toBe(2)
-        expect(appStore.stores[0].$id).toBe("userStore")
-        expect(appStore.stores[1].$id).toBe("geodeStore")
+        expect(appStore.stores).toHaveLength(MULTIPLE_STORES_LENGTH)
+        expect(appStore.stores[FIRST_INDEX].$id).toBe("userStore")
+        expect(appStore.stores[SECOND_INDEX].$id).toBe("geodeStore")
       })
     })
 
-    describe("Export", () => {
+    describe("export", () => {
       test("export stores with exportStores method", async () => {
+        setup()
         const appStore = useAppStore()
         const mock_store_1 = {
           $id: "userStore",
@@ -70,14 +81,14 @@ describe("App Store", () => {
             name: "toto",
             email: "toto@titi.com",
           })),
-          importStores: vi.fn().mockImplementation(() => {}),
+          importStores: vi.fn().mockImplementation(),
         }
         const mock_store_2 = {
           $id: "geodeStore",
           exportStores: vi
             .fn()
             .mockImplementation(() => ({ items: [], total: 0 })),
-          importStores: vi.fn().mockImplementation(() => {}),
+          importStores: vi.fn().mockImplementation(),
         }
 
         appStore.registerStore(mock_store_1)
@@ -85,24 +96,25 @@ describe("App Store", () => {
 
         const snapshot = await appStore.exportStores()
 
-        expect(mock_store_1.exportStores).toHaveBeenCalledTimes(1)
-        expect(mock_store_2.exportStores).toHaveBeenCalledTimes(1)
-        expect(snapshot).toEqual({
+        expect(mock_store_1.exportStores).toHaveBeenCalledTimes(CALL_COUNT_ONCE)
+        expect(mock_store_2.exportStores).toHaveBeenCalledTimes(CALL_COUNT_ONCE)
+        expect(snapshot).toStrictEqual({
           userStore: { name: "toto", email: "toto@titi.com" },
           geodeStore: { items: [], total: 0 },
         })
       })
 
       test("skip stores without exportSave method", async () => {
+        setup()
         const appStore = useAppStore()
         const mock_store_1 = {
           $id: "withSave",
           exportStores: vi.fn().mockImplementation(() => ({ data: "test" })),
-          importStores: vi.fn().mockImplementation(() => {}),
+          importStores: vi.fn().mockImplementation(),
         }
         const mock_store_2 = {
           $id: "withoutSave",
-          importStores: vi.fn().mockImplementation(() => {}),
+          importStores: vi.fn().mockImplementation(),
         }
 
         appStore.registerStore(mock_store_1)
@@ -110,22 +122,24 @@ describe("App Store", () => {
 
         const snapshot = await appStore.exportStores()
 
-        expect(mock_store_1.exportStores).toHaveBeenCalledTimes(1)
-        expect(snapshot).toEqual({
+        expect(mock_store_1.exportStores).toHaveBeenCalledTimes(CALL_COUNT_ONCE)
+        expect(snapshot).toStrictEqual({
           withSave: { data: "test" },
         })
         expect(snapshot.withoutSave).toBeUndefined()
       })
 
       test("return empty snapshot when no stores registered", async () => {
+        setup()
         const appStore = useAppStore()
         const snapshot = await appStore.exportStores()
-        expect(snapshot).toEqual({})
+        expect(snapshot).toStrictEqual({})
       })
     })
 
     describe("load", () => {
-      test("App Store > actions > importStores > import stores with importStores method", async () => {
+      test("import stores with importStores method", async () => {
+        setup()
         const appStore = useAppStore()
         const userStore = {
           $id: "userStore",
@@ -142,20 +156,21 @@ describe("App Store", () => {
           geodeStore: { other: "data" },
         }
         await appStore.importStores(snapshot)
-        expect(userStore.importStores).toHaveBeenCalledTimes(1)
-        expect(geodeStore.importStores).toHaveBeenCalledTimes(1)
+        expect(userStore.importStores).toHaveBeenCalledTimes(CALL_COUNT_ONCE)
+        expect(geodeStore.importStores).toHaveBeenCalledTimes(CALL_COUNT_ONCE)
       })
 
-      test("skip stores without importStores method", () => {
+      test("skip stores without importStores method", async () => {
+        setup()
         const appStore = useAppStore()
         const mock_store_1 = {
           $id: "withImport",
-          save: vi.fn().mockImplementation(() => {}),
-          importStores: vi.fn().mockImplementation(() => {}),
+          save: vi.fn().mockImplementation(),
+          importStores: vi.fn().mockImplementation(),
         }
         const mock_store_2 = {
           $id: "withoutImport",
-          save: vi.fn().mockImplementation(() => {}),
+          save: vi.fn().mockImplementation(),
         }
         appStore.registerStore(mock_store_1)
         appStore.registerStore(mock_store_2)
@@ -163,22 +178,21 @@ describe("App Store", () => {
           withImport: { data: "test" },
           withoutImport: { data: "ignored" },
         }
-        appStore.importStores(snapshot)
-        expect(mock_store_1.importStores).toHaveBeenCalledTimes(1)
+        await appStore.importStores(snapshot)
+        expect(mock_store_1.importStores).toHaveBeenCalledTimes(CALL_COUNT_ONCE)
         expect(mock_store_2.importStores).toBeUndefined()
       })
 
-      test("warn when store not found in snapshot", () => {
+      test("warn when store not found in snapshot", async () => {
+        setup()
         const appStore = useAppStore()
-        const console_warn_spy = vi
-          .spyOn(console, "warn")
-          .mockImplementation(() => {})
+        const console_warn_spy = vi.spyOn(console, "warn").mockImplementation()
         const mock_store = {
           $id: "testStore",
-          importStores: vi.fn().mockImplementation(() => {}),
+          importStores: vi.fn().mockImplementation(),
         }
         appStore.registerStore(mock_store)
-        appStore.importStores({})
+        await appStore.importStores({})
         expect(console_warn_spy).toHaveBeenCalledWith(
           expect.stringContaining("Stores not found in snapshot: testStore"),
         )
diff --git a/tests/unit/stores/Feedback.nuxt.test.js b/tests/unit/stores/Feedback.nuxt.test.js
index 0e29109f..8f04e8d0 100644
--- a/tests/unit/stores/Feedback.nuxt.test.js
+++ b/tests/unit/stores/Feedback.nuxt.test.js
@@ -1,84 +1,78 @@
-import { setActivePinia } from "pinia"
+import { describe, expect, expectTypeOf, test, vi } from "vitest"
 import { createTestingPinia } from "@pinia/testing"
+import { setActivePinia } from "pinia"
 import { useFeedbackStore } from "@ogw_front/stores/feedback"
-import { beforeEach, describe, expect, expectTypeOf, test, vi } from "vitest"
 
-beforeEach(async () => {
-  const pinia = createTestingPinia({
-    stubActions: false,
-    createSpy: vi.fn,
-  })
+// CONSTANTS
+const TIMEOUT_MS = 500
+const DELAY_MS = 1000
+const L1 = 1
+const L0 = 0
+const INDEX_0 = 0
+const STATUS_500 = 500
+
+function setup() {
+  const pinia = createTestingPinia({ stubActions: false, createSpy: vi.fn })
   setActivePinia(pinia)
-})
+}
 
-describe("Feedback Store", () => {
-  describe("state", () => {
-    test("initial state", () => {
-      const feedbackStore = useFeedbackStore()
-      expectTypeOf(feedbackStore.feedbacks).toEqualTypeOf([])
-      expectTypeOf(feedbackStore.server_error).toBeBoolean()
-    })
+describe("feedback store state", () => {
+  test("initial state", () => {
+    setup()
+    const fb = useFeedbackStore()
+    expectTypeOf(fb.feedbacks).toEqualTypeOf([])
+    expectTypeOf(fb.server_error).toBeBoolean()
   })
-  describe("actions", () => {
-    describe("add_error", () => {
-      test("test add_error", () => {
-        const feedbackStore = useFeedbackStore()
-        feedbackStore.add_error(
-          500,
-          "/test",
-          "test message",
-          "test description",
-        )
-        expect(feedbackStore.feedbacks.length).toBe(1)
-        expect(feedbackStore.feedbacks[0].type).toBe("error")
-      })
-    })
+})
 
-    describe("add_error", () => {
-      test("test feedbacks_timeout", () => {
-        const feedbackStore = useFeedbackStore()
-        feedbackStore.feedbacks_timeout_miliseconds = 500
-        feedbackStore.add_error(
-          500,
-          "/test",
-          "test message",
-          "test description",
-        )
-        expect(feedbackStore.feedbacks.length).toBe(1)
-        setTimeout(() => {
-          expect(feedbackStore.feedbacks.length).toBe(0)
-        }, 1000)
-      })
+describe("feedback store", () => {
+  describe("add_error", () => {
+    test("basic addition", () => {
+      setup()
+      const fb = useFeedbackStore()
+      fb.add_error(STATUS_500, "/t", "m", "d")
+      expect(fb.feedbacks).toHaveLength(L1)
+      expect(fb.feedbacks[INDEX_0].type).toBe("error")
     })
 
-    describe("add_success", () => {
-      test("test add_success", () => {
-        const feedbackStore = useFeedbackStore()
-        feedbackStore.feedbacks_timeout_miliseconds = 500
-        feedbackStore.add_success("test description")
-        expect(feedbackStore.feedbacks.length).toBe(1)
-        expect(feedbackStore.feedbacks[0].type).toBe("success")
+    test("feedbacks_timeout", () => {
+      setup()
+      const fb = useFeedbackStore()
+      fb.feedbacks_timeout_miliseconds = TIMEOUT_MS
+      fb.add_error(STATUS_500, "/t", "m", "d")
+      expect(fb.feedbacks).toHaveLength(L1)
+      setTimeout(() => expect(fb.feedbacks).toHaveLength(L0), DELAY_MS)
+    })
+  })
 
-        setTimeout(() => {
-          expect(feedbackStore.feedbacks.length).toBe(0)
-        }, 1000)
-      })
+  describe("add_success", () => {
+    test("basic success", () => {
+      setup()
+      const fb = useFeedbackStore()
+      fb.feedbacks_timeout_miliseconds = TIMEOUT_MS
+      fb.add_success("d")
+      expect(fb.feedbacks).toHaveLength(L1)
+      expect(fb.feedbacks[INDEX_0].type).toBe("success")
+      setTimeout(() => expect(fb.feedbacks).toHaveLength(L0), DELAY_MS)
     })
-    describe("delete_feedback", () => {
-      test("test", () => {
-        const feedbackStore = useFeedbackStore()
-        feedbackStore.delete_feedback(0)
-        expect(feedbackStore.feedbacks.length).toBe(0)
-      })
+  })
+
+  describe("delete_feedback", () => {
+    test("removal by index", () => {
+      setup()
+      const fb = useFeedbackStore()
+      fb.delete_feedback(INDEX_0)
+      expect(fb.feedbacks).toHaveLength(L0)
     })
+  })
 
-    describe("delete_server_error", () => {
-      test("test", () => {
-        const feedbackStore = useFeedbackStore()
-        feedbackStore.$patch({ server_error: true })
-        feedbackStore.delete_server_error()
-        expect(feedbackStore.server_error).toBe(false)
-      })
+  describe("delete_server_error", () => {
+    test("reset server_error state", () => {
+      setup()
+      const fb = useFeedbackStore()
+      fb.$patch({ server_error: true })
+      fb.delete_server_error()
+      expect(fb.server_error).toBeFalsy()
     })
   })
 })
diff --git a/tests/unit/stores/Geode.nuxt.test.js b/tests/unit/stores/Geode.nuxt.test.js
index d0053be9..2905f93f 100644
--- a/tests/unit/stores/Geode.nuxt.test.js
+++ b/tests/unit/stores/Geode.nuxt.test.js
@@ -1,6 +1,6 @@
-import { setActivePinia } from "pinia"
+import { describe, expect, expectTypeOf, test, vi } from "vitest"
 import { createTestingPinia } from "@pinia/testing"
-import { describe, test, expect, expectTypeOf, beforeEach, vi } from "vitest"
+import { setActivePinia } from "pinia"
 import { registerEndpoint } from "@nuxt/test-utils/runtime"
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 import Status from "@ogw_front/utils/status"
@@ -8,157 +8,169 @@ import { appMode } from "@ogw_front/utils/app_mode"
 import { useInfraStore } from "@ogw_front/stores/infra"
 import { useGeodeStore } from "@ogw_front/stores/geode"
 
-beforeEach(async () => {
-  const pinia = createTestingPinia({
-    stubActions: false,
-    createSpy: vi.fn,
-  })
+// CONSTANTS
+const PORT_443 = "443"
+const PORT_12 = "12"
+const PORT_5000 = "5000"
+const CLOUD_ID = "123456"
+const STATUS_500 = 500
+const L1 = 1
+const L0 = 0
+
+function setup() {
+  const pinia = createTestingPinia({ stubActions: false, createSpy: vi.fn })
   setActivePinia(pinia)
-})
+}
+
+describe("geode store", () => {
+  test("state", () => {
+    setup()
+    const geodeStore = useGeodeStore()
+    expectTypeOf(geodeStore.default_local_port).toBeString()
+    expectTypeOf(geodeStore.request_counter).toBeNumber()
+    expectTypeOf(geodeStore.status).toBeString()
+  })
 
-describe("Geode store", () => {
-  describe("state", () => {
-    test("initial state", () => {
+  describe("protocol", () => {
+    test("app_mode CLOUD", () => {
+      setup()
+      const infraStore = useInfraStore()
       const geodeStore = useGeodeStore()
-      expectTypeOf(geodeStore.default_local_port).toBeString()
-      expectTypeOf(geodeStore.request_counter).toBeNumber()
-      expectTypeOf(geodeStore.status).toBeString()
+      infraStore.app_mode = appMode.CLOUD
+      expect(geodeStore.protocol).toBe("https")
+    })
+
+    test("app_mode BROWSER/DESKTOP", () => {
+      setup()
+      const infraStore = useInfraStore()
+      const geodeStore = useGeodeStore()
+      infraStore.app_mode = appMode.BROWSER
+      expect(geodeStore.protocol).toBe("http")
+      infraStore.app_mode = appMode.DESKTOP
+      expect(geodeStore.protocol).toBe("http")
     })
   })
 
-  describe("getters", () => {
-    describe("protocol", () => {
-      test("test app_mode CLOUD", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        infraStore.app_mode = appMode.CLOUD
-        expect(geodeStore.protocol).toBe("https")
-      })
-      test("test app_mode BROWSER", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        infraStore.app_mode = appMode.BROWSER
-        expect(geodeStore.protocol).toBe("http")
-      })
-      test("test app_mode DESKTOP", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        infraStore.app_mode = appMode.DESKTOP
-        expect(geodeStore.protocol).toBe("http")
-      })
+  describe("port", () => {
+    test("app_mode CLOUD", () => {
+      setup()
+      const infraStore = useInfraStore()
+      const geodeStore = useGeodeStore()
+      infraStore.app_mode = appMode.CLOUD
+      expect(geodeStore.port).toBe(PORT_443)
     })
 
-    describe("port", () => {
-      test("test app_mode CLOUD", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        infraStore.app_mode = appMode.CLOUD
-        expect(geodeStore.port).toBe("443")
-      })
-      test("test app_mode BROWSER", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        infraStore.app_mode = appMode.BROWSER
-        expect(geodeStore.port).toBe(geodeStore.default_local_port)
-      })
-      test("test app_mode DESKTOP", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        infraStore.app_mode = appMode.DESKTOP
-        expect(geodeStore.port).toBe(geodeStore.default_local_port)
-      })
+    test("app_mode BROWSER/DESKTOP", () => {
+      setup()
+      const infraStore = useInfraStore()
+      const geodeStore = useGeodeStore()
+      infraStore.app_mode = appMode.BROWSER
+      expect(geodeStore.port).toBe(geodeStore.default_local_port)
+      infraStore.app_mode = appMode.DESKTOP
+      expect(geodeStore.port).toBe(geodeStore.default_local_port)
+    })
 
-      test("test override default_local_port", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        infraStore.app_mode = appMode.DESKTOP
-        geodeStore.default_local_port = "12"
-        expect(geodeStore.port).toBe("12")
-      })
+    test("override default_local_port", () => {
+      setup()
+      const infraStore = useInfraStore()
+      const geodeStore = useGeodeStore()
+      infraStore.app_mode = appMode.DESKTOP
+      geodeStore.default_local_port = PORT_12
+      expect(geodeStore.port).toBe(PORT_12)
     })
+  })
 
-    describe("base_url", () => {
-      test("test app_mode BROWSER", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        infraStore.app_mode = appMode.BROWSER
-        infraStore.domain_name = "localhost"
-        expect(geodeStore.base_url).toBe("http://localhost:5000")
-      })
-      test("test app_mode CLOUD", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        infraStore.app_mode = appMode.CLOUD
-        infraStore.ID = "123456"
-        infraStore.domain_name = "example.com"
-        expect(geodeStore.base_url).toBe("https://example.com:443/123456/geode")
-      })
-      test("test app_mode CLOUD, ID empty", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        infraStore.app_mode = appMode.CLOUD
-        infraStore.ID = ""
-        infraStore.domain_name = "example.com"
-        expect(() => geodeStore.base_url).toThrowError(
-          "ID must not be empty in cloud mode",
-        )
-      })
+  describe("base_url", () => {
+    test("app_mode BROWSER", () => {
+      setup()
+      const infraStore = useInfraStore()
+      const geodeStore = useGeodeStore()
+      infraStore.app_mode = appMode.BROWSER
+      infraStore.domain_name = "localhost"
+      expect(geodeStore.base_url).toBe(`http://localhost:${PORT_5000}`)
     })
 
-    describe("is_busy", () => {
-      test("test is_busy", () => {
-        const geodeStore = useGeodeStore()
-        geodeStore.request_counter = 1
-        expect(geodeStore.is_busy).toBe(true)
-      })
-      test("test not is_busy", () => {
-        const geodeStore = useGeodeStore()
-        geodeStore.request_counter = 0
-        expect(geodeStore.is_busy).toBe(false)
-      })
+    test("app_mode CLOUD", () => {
+      setup()
+      const infraStore = useInfraStore()
+      const geodeStore = useGeodeStore()
+      infraStore.app_mode = appMode.CLOUD
+      infraStore.ID = CLOUD_ID
+      infraStore.domain_name = "example.com"
+      expect(geodeStore.base_url).toBe(
+        `https://example.com:${PORT_443}/${CLOUD_ID}/geode`,
+      )
+    })
+
+    test("app_mode CLOUD, ID empty", () => {
+      setup()
+      const infraStore = useInfraStore()
+      const geodeStore = useGeodeStore()
+      infraStore.app_mode = appMode.CLOUD
+      infraStore.ID = ""
+      infraStore.domain_name = "example.com"
+      expect(() => geodeStore.base_url).toThrow(
+        "ID must not be empty in cloud mode",
+      )
     })
   })
 
-  describe("actions", () => {
-    describe("ping", () => {
-      const getFakeCall = vi.fn()
-      registerEndpoint(back_schemas.opengeodeweb_back.ping.$id, getFakeCall)
-
-      test("response", async () => {
-        const geodeStore = useGeodeStore()
-        geodeStore.base_url = ""
-        getFakeCall.mockImplementation(() => ({}))
-        await geodeStore.ping()
-        expect(geodeStore.status).toBe(Status.CONNECTED)
-      })
-      test("response_error", async () => {
-        const geodeStore = useGeodeStore()
-        geodeStore.base_url = ""
-        getFakeCall.mockImplementation(() => {
-          throw createError({
-            status: 500,
-          })
-        })
-        await expect(geodeStore.ping()).rejects.toThrow()
-        expect(geodeStore.status).toBe(Status.NOT_CONNECTED)
-      })
+  describe("is_busy", () => {
+    test("is_busy", () => {
+      setup()
+      const geodeStore = useGeodeStore()
+      geodeStore.request_counter = L1
+      expect(geodeStore.is_busy).toBeTruthy()
     })
 
-    describe("start_request", () => {
-      test("test increment", async () => {
-        const geodeStore = useGeodeStore()
-        expect(geodeStore.request_counter).toBe(0)
-        await geodeStore.start_request()
-        expect(geodeStore.request_counter).toBe(1)
-      })
+    test("not is_busy", () => {
+      setup()
+      const geodeStore = useGeodeStore()
+      geodeStore.request_counter = L0
+      expect(geodeStore.is_busy).toBeFalsy()
     })
-    describe("stop_request", () => {
-      test("test decrement", async () => {
-        const geodeStore = useGeodeStore()
-        geodeStore.request_counter = 1
-        await geodeStore.stop_request()
-        expect(geodeStore.request_counter).toBe(0)
+  })
+})
+
+describe("geode store actions", () => {
+  const getFakeCall = vi.fn()
+
+  function setupActions() {
+    setup()
+    registerEndpoint(back_schemas.opengeodeweb_back.ping.$id, getFakeCall)
+  }
+
+  describe("ping", () => {
+    test("response", async () => {
+      setupActions()
+      const geodeStore = useGeodeStore()
+      geodeStore.base_url = ""
+      getFakeCall.mockImplementation(() => ({}))
+      await geodeStore.ping()
+      expect(geodeStore.status).toBe(Status.CONNECTED)
+    })
+
+    test("response_error", async () => {
+      setupActions()
+      const geodeStore = useGeodeStore()
+      geodeStore.base_url = ""
+      getFakeCall.mockImplementation(() => {
+        throw createError({ status: STATUS_500 })
       })
+      await expect(geodeStore.ping()).rejects.toThrow("500")
+      expect(geodeStore.status).toBe(Status.NOT_CONNECTED)
+    })
+  })
+
+  describe("request counter", () => {
+    test("increment/decrement", async () => {
+      setupActions()
+      const geodeStore = useGeodeStore()
+      expect(geodeStore.request_counter).toBe(L0)
+      await geodeStore.start_request()
+      expect(geodeStore.request_counter).toBe(L1)
+      await geodeStore.stop_request()
+      expect(geodeStore.request_counter).toBe(L0)
     })
   })
 })
diff --git a/tests/unit/stores/Infra.nuxt.test.js b/tests/unit/stores/Infra.nuxt.test.js
index 467aebb9..58360f74 100644
--- a/tests/unit/stores/Infra.nuxt.test.js
+++ b/tests/unit/stores/Infra.nuxt.test.js
@@ -1,22 +1,28 @@
 // Global imports
-
-// Third party imports
+import { describe, expect, expectTypeOf, test, vi } from "vitest"
+import { createTestingPinia } from "@pinia/testing"
 import { registerEndpoint } from "@nuxt/test-utils/runtime"
 import { setActivePinia } from "pinia"
-import { createTestingPinia } from "@pinia/testing"
-import { beforeEach, describe, expect, expectTypeOf, test, vi } from "vitest"
+
 // Local imports
 import Status from "@ogw_front/utils/status"
 import { appMode } from "@ogw_front/utils/app_mode"
-import { useInfraStore } from "@ogw_front/stores/infra"
 import { useGeodeStore } from "@ogw_front/stores/geode"
-import { useViewerStore } from "@ogw_front/stores/viewer"
+import { useInfraStore } from "@ogw_front/stores/infra"
 import { useLambdaStore } from "@ogw_front/stores/lambda"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
+// CONSTANTS
+const ID_VAL = "123456"
+const L1 = 1
+const L2 = 2
+const L0 = 0
+const INDEX_0 = 0
+const LOCALHOST = "localhost"
+const CLOUD_DOMAIN = "api.geode-solutions.com"
 
 // Mock navigator.locks API
-const mockLockRequest = vi.fn().mockImplementation(async (name, callback) => {
-  return callback({ name })
-})
+const mockLockRequest = vi.fn().mockImplementation((name, fn) => fn({ name }))
 
 vi.stubGlobal("navigator", {
   ...navigator,
@@ -25,287 +31,141 @@ vi.stubGlobal("navigator", {
   },
 })
 
-beforeEach(async () => {
+function setup() {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
   })
   setActivePinia(pinia)
+}
+
+describe("infra store state", () => {
+  test("initial state", () => {
+    setup()
+    const infraStore = useInfraStore()
+    expectTypeOf(infraStore.ID).toBeString()
+    expectTypeOf(infraStore.is_captcha_validated).toBeBoolean()
+    expectTypeOf(infraStore.status).toBeString()
+  })
 })
 
-describe("Infra Store", () => {
-  describe("state", () => {
-    test("initial state", () => {
-      const infraStore = useInfraStore()
-      expectTypeOf(infraStore.ID).toBeString()
-      expectTypeOf(infraStore.is_captcha_validated).toBeBoolean()
-      expectTypeOf(infraStore.status).toBeString()
-    })
+describe("infra store mode getters", () => {
+  test("app_mode types", () => {
+    setup()
+    const infraStore = useInfraStore()
+    expectTypeOf(infraStore.app_mode).toBeString()
   })
-  describe("getters", () => {
-    describe("app_mode", () => {
-      test("test type", () => {
-        const infraStore = useInfraStore()
-        expectTypeOf(infraStore.app_mode).toBeString()
-      })
-    })
-
-    describe("domain_name", () => {
-      test("test app_mode BROWSER", () => {
-        const infraStore = useInfraStore()
-        infraStore.app_mode = appMode.BROWSER
-        expect(infraStore.domain_name).toBe("localhost")
-      })
-      test("test app_mode DESKTOP", () => {
-        const infraStore = useInfraStore()
-        infraStore.app_mode = appMode.DESKTOP
-        expect(infraStore.domain_name).toBe("localhost")
-      })
-      test("test app_mode CLOUD", () => {
-        const infraStore = useInfraStore()
-        infraStore.app_mode = appMode.CLOUD
-        expect(infraStore.domain_name).toBe("api.geode-solutions.com")
-      })
-    })
-
-    describe("microservices_connected", () => {
-      test("test no microservices registered", () => {
-        const infraStore = useInfraStore()
-        expect(infraStore.microservices_connected).toBe(true)
-      })
-      test("test geode false & viewer false", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        const viewerStore = useViewerStore()
-
-        infraStore.register_microservice(geodeStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
-        infraStore.register_microservice(viewerStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
-
-        geodeStore.$patch({ status: Status.NOT_CONNECTED })
-        viewerStore.$patch({ status: Status.NOT_CONNECTED })
-        expect(infraStore.microservices_connected).toBe(false)
-      })
-      test("test geode true & viewer false", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        const viewerStore = useViewerStore()
-
-        infraStore.register_microservice(geodeStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
-        infraStore.register_microservice(viewerStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
-
-        geodeStore.$patch({ status: Status.CONNECTED })
-        viewerStore.$patch({ status: Status.NOT_CONNECTED })
-        expect(infraStore.microservices_connected).toBe(false)
-      })
-      test("test geode false & viewer true", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        const viewerStore = useViewerStore()
-
-        infraStore.register_microservice(geodeStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
-        infraStore.register_microservice(viewerStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
-
-        geodeStore.$patch({ status: Status.NOT_CONNECTED })
-        viewerStore.$patch({ status: Status.CONNECTED })
-        expect(infraStore.microservices_connected).toBe(false)
-      })
-      test("test geode true & viewer true", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        const viewerStore = useViewerStore()
 
-        infraStore.register_microservice(geodeStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
-        infraStore.register_microservice(viewerStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
-
-        geodeStore.$patch({ status: Status.CONNECTED })
-        viewerStore.$patch({ status: Status.CONNECTED })
-        expect(infraStore.microservices_connected).toBe(true)
-      })
-    })
-
-    describe("microservices_busy", () => {
-      test("test no microservices registered", () => {
-        const infraStore = useInfraStore()
-        expect(infraStore.microservices_busy).toBe(false)
-      })
-      test("test geode false & viewer false", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        const viewerStore = useViewerStore()
-
-        infraStore.register_microservice(geodeStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
-        infraStore.register_microservice(viewerStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
-
-        geodeStore.$patch({ request_counter: 0 })
-        viewerStore.$patch({ request_counter: 0 })
-        expect(infraStore.microservices_busy).toBe(false)
-      })
-      test("test geode true & viewer false", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        const viewerStore = useViewerStore()
-
-        infraStore.register_microservice(geodeStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
-        infraStore.register_microservice(viewerStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
-
-        geodeStore.$patch({ request_counter: 1 })
-        viewerStore.$patch({ request_counter: 0 })
-        expect(infraStore.microservices_busy).toBe(true)
-      })
-      test("test geode false & viewer true", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        const viewerStore = useViewerStore()
-
-        infraStore.register_microservice(geodeStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
-        infraStore.register_microservice(viewerStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
-
-        geodeStore.$patch({ request_counter: 0 })
-        viewerStore.$patch({ request_counter: 1 })
-        expect(infraStore.microservices_busy).toBe(true)
-      })
-      test("test geode true & viewer true", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        const viewerStore = useViewerStore()
+  test("domain_name BROWSER/DESKTOP", () => {
+    setup()
+    const infraStore = useInfraStore()
+    infraStore.app_mode = appMode.BROWSER
+    expect(infraStore.domain_name).toBe(LOCALHOST)
+    infraStore.app_mode = appMode.DESKTOP
+    expect(infraStore.domain_name).toBe(LOCALHOST)
+  })
 
-        infraStore.register_microservice(geodeStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
-        infraStore.register_microservice(viewerStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
+  test("domain_name CLOUD", () => {
+    setup()
+    const infraStore = useInfraStore()
+    infraStore.app_mode = appMode.CLOUD
+    expect(infraStore.domain_name).toBe(CLOUD_DOMAIN)
+  })
+})
 
-        geodeStore.$patch({ request_counter: 1 })
-        viewerStore.$patch({ request_counter: 1 })
-        expect(infraStore.microservices_busy).toBe(true)
-      })
-    })
+describe("infra store connectivity getters", () => {
+  test("no microservices registered", () => {
+    setup()
+    const infraStore = useInfraStore()
+    expect(infraStore.microservices_connected).toBeTruthy()
   })
 
-  describe("actions", () => {
-    describe("register_microservice", () => {
-      test("register geode microservice", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
+  test("partial and full connectivity", () => {
+    setup()
+    const infraStore = useInfraStore()
+    const geodeStore = useGeodeStore()
+    const viewerStore = useViewerStore()
+    const mockApi = { request: vi.fn(), connect: vi.fn(), launch: vi.fn() }
+    infraStore.register_microservice(geodeStore, mockApi)
+    infraStore.register_microservice(viewerStore, mockApi)
 
-        infraStore.register_microservice(geodeStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
+    geodeStore.$patch({ status: Status.NOT_CONNECTED })
+    viewerStore.$patch({ status: Status.NOT_CONNECTED })
+    expect(infraStore.microservices_connected).toBeFalsy()
 
-        expect(infraStore.microservices.length).toBe(1)
-        expect(infraStore.microservices[0].$id).toBe("geode")
-      })
+    geodeStore.$patch({ status: Status.CONNECTED })
+    expect(infraStore.microservices_connected).toBeFalsy()
 
-      test("register multiple microservices", () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        const viewerStore = useViewerStore()
+    viewerStore.$patch({ status: Status.CONNECTED })
+    expect(infraStore.microservices_connected).toBeTruthy()
+  })
+})
 
-        infraStore.register_microservice(geodeStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
+describe("infra store busy getters", () => {
+  test("busy status mapping", () => {
+    setup()
+    const infraStore = useInfraStore()
+    const geodeStore = useGeodeStore()
+    const viewerStore = useViewerStore()
+    const mockApi = { request: vi.fn(), connect: vi.fn(), launch: vi.fn() }
+    expect(infraStore.microservices_busy).toBeFalsy()
+
+    infraStore.register_microservice(geodeStore, mockApi)
+    infraStore.register_microservice(viewerStore, mockApi)
+    geodeStore.$patch({ request_counter: L0 })
+    viewerStore.$patch({ request_counter: L0 })
+    expect(infraStore.microservices_busy).toBeFalsy()
+
+    geodeStore.$patch({ request_counter: L1 })
+    expect(infraStore.microservices_busy).toBeTruthy()
+
+    geodeStore.$patch({ request_counter: L0 })
+    viewerStore.$patch({ request_counter: L1 })
+    expect(infraStore.microservices_busy).toBeTruthy()
+  })
+})
 
-        infraStore.register_microservice(viewerStore, {
-          request: vi.fn(),
-          connect: vi.fn(),
-          launch: vi.fn(),
-        })
+describe("infra store registration actions", () => {
+  test("register microservices", () => {
+    setup()
+    const infraStore = useInfraStore()
+    const geodeStore = useGeodeStore()
+    const viewerStore = useViewerStore()
+    const mockApi = { request: vi.fn(), connect: vi.fn(), launch: vi.fn() }
 
-        expect(infraStore.microservices.length).toBe(2)
-      })
-    })
+    infraStore.register_microservice(geodeStore, mockApi)
+    expect(infraStore.microservices).toHaveLength(L1)
+    expect(infraStore.microservices[INDEX_0].$id).toBe("geode")
 
-    describe("create_backend", () => {
-      test("test without microservices", async () => {
-        const infraStore = useInfraStore()
-        infraStore.app_mode = appMode.BROWSER
-        await infraStore.create_backend()
-        expect(infraStore.status).toBe(Status.CREATED)
-      })
-      test("test with end-point", async () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        const viewerStore = useViewerStore()
-        const lambdaStore = useLambdaStore()
+    infraStore.register_microservice(viewerStore, mockApi)
+    expect(infraStore.microservices).toHaveLength(L2)
+  })
+})
 
-        infraStore.app_mode = appMode.CLOUD
-        const ID = "123456"
-        registerEndpoint(lambdaStore.base_url, {
-          method: "POST",
-          handler: () => ({ ID }),
-        })
-        await infraStore.create_backend()
-        expect(infraStore.status).toBe(Status.CREATED)
-        expect(infraStore.ID).toBe(ID)
+describe("infra store backend actions", () => {
+  test("create_backend BROWSER", async () => {
+    setup()
+    const infraStore = useInfraStore()
+    infraStore.app_mode = appMode.BROWSER
+    await infraStore.create_backend()
+    expect(infraStore.status).toBe(Status.CREATED)
+  })
 
-        expect(geodeStore.status).toBe(Status.NOT_CONNECTED)
-        expect(viewerStore.status).toBe(Status.NOT_CONNECTED)
-      })
+  test("create_backend CLOUD", async () => {
+    setup()
+    const infraStore = useInfraStore()
+    const geodeStore = useGeodeStore()
+    const viewerStore = useViewerStore()
+    const lambdaStore = useLambdaStore()
+    infraStore.app_mode = appMode.CLOUD
+    registerEndpoint(lambdaStore.base_url, {
+      method: "POST",
+      handler: () => ({ ID: ID_VAL }),
     })
+    await infraStore.create_backend()
+    expect(infraStore.status).toBe(Status.CREATED)
+    expect(infraStore.ID).toBe(ID_VAL)
+    expect(geodeStore.status).toBe(Status.NOT_CONNECTED)
+    expect(viewerStore.status).toBe(Status.NOT_CONNECTED)
   })
 })
diff --git a/tests/unit/stores/Lambda.nuxt.test.js b/tests/unit/stores/Lambda.nuxt.test.js
index 6588dcc5..5b6087be 100644
--- a/tests/unit/stores/Lambda.nuxt.test.js
+++ b/tests/unit/stores/Lambda.nuxt.test.js
@@ -1,10 +1,8 @@
 // Global imports
-
-// Third party imports
+import { describe, expect, expectTypeOf, test, vi } from "vitest"
+import { createTestingPinia } from "@pinia/testing"
 import { registerEndpoint } from "@nuxt/test-utils/runtime"
 import { setActivePinia } from "pinia"
-import { createTestingPinia } from "@pinia/testing"
-import { beforeEach, describe, expect, expectTypeOf, test, vi } from "vitest"
 
 import { useFeedbackStore } from "@ogw_front/stores/feedback"
 import { useLambdaStore } from "@ogw_front/stores/lambda"
@@ -12,122 +10,114 @@ import { useLambdaStore } from "@ogw_front/stores/lambda"
 // Local imports
 import Status from "@ogw_front/utils/status"
 
-beforeEach(async () => {
+// CONSTANTS
+const PORT_443 = "443"
+const API_URL = "api.example.com"
+const SITE_BRANCH = "/test"
+const PROJECT = "/project"
+const TEST_ID = "test-id-123456"
+const STATUS_500 = 500
+
+function setup() {
   const pinia = createTestingPinia({
     stubActions: false,
     createSpy: vi.fn,
   })
   setActivePinia(pinia)
-})
-
-describe("Lambda Store", () => {
-  describe("state", () => {
-    test("initial state", () => {
-      const lambdaStore = useLambdaStore()
-      expectTypeOf(lambdaStore.status).toBeString()
-      expect(lambdaStore.status).toBe(Status.NOT_CONNECTED)
-    })
+}
+
+function setupConfig() {
+  const config = useRuntimeConfig()
+  config.public.API_URL = API_URL
+  config.public.SITE_BRANCH = SITE_BRANCH
+  config.public.PROJECT = PROJECT
+}
+
+describe("lambda store state and config", () => {
+  test("initial state", () => {
+    setup()
+    const lambdaStore = useLambdaStore()
+    expectTypeOf(lambdaStore.status).toBeString()
+    expect(lambdaStore.status).toBe(Status.NOT_CONNECTED)
   })
 
   describe("getters", () => {
-    describe("protocol", () => {
-      test("test protocol is always https", () => {
-        const lambdaStore = useLambdaStore()
-        expect(lambdaStore.protocol).toBe("https")
-      })
-    })
-
-    describe("port", () => {
-      test("test port is always 443", () => {
-        const lambdaStore = useLambdaStore()
-        expect(lambdaStore.port).toBe("443")
-      })
+    test("protocol and port", () => {
+      setup()
+      const lambdaStore = useLambdaStore()
+      expect(lambdaStore.protocol).toBe("https")
+      expect(lambdaStore.port).toBe(PORT_443)
     })
 
-    describe("base_url", () => {
-      test("test base_url construction", () => {
-        const lambdaStore = useLambdaStore()
-        useRuntimeConfig().public.API_URL = "api.example.com"
-        useRuntimeConfig().public.SITE_BRANCH = "/test"
-        useRuntimeConfig().public.PROJECT = "/project"
-        expect(lambdaStore.base_url).toBe(
-          "https://api.example.com:443/test/project/createbackend",
-        )
-      })
+    test("base_url construction", () => {
+      setup()
+      setupConfig()
+      const lambdaStore = useLambdaStore()
+      expect(lambdaStore.base_url).toBe(
+        `https://${API_URL}:${PORT_443}${SITE_BRANCH}${PROJECT}/createbackend`,
+      )
     })
 
-    describe("is_busy", () => {
-      test("test is_busy is always false", () => {
-        const lambdaStore = useLambdaStore()
-        expect(lambdaStore.is_busy).toBe(false)
-      })
+    test("is_busy is always false", () => {
+      setup()
+      const lambdaStore = useLambdaStore()
+      expect(lambdaStore.is_busy).toBeFalsy()
     })
   })
+})
 
-  describe("actions", () => {
-    describe("launch", () => {
-      const postFakeCall = vi.fn()
-
-      test("successful launch", async () => {
-        const lambdaStore = useLambdaStore()
-        const feedbackStore = useFeedbackStore()
-
-        useRuntimeConfig().public.API_URL = "api.example.com"
-        useRuntimeConfig().public.SITE_BRANCH = "/test"
-        useRuntimeConfig().public.PROJECT = "/project"
-
-        lambdaStore.base_url = "test-base-url"
-        registerEndpoint(lambdaStore.base_url, {
-          method: "POST",
-          handler: postFakeCall,
-        })
-
-        postFakeCall.mockImplementation(() => ({
-          ID: "test-id-123456",
-        }))
+describe("lambda store actions", () => {
+  const postFakeCall = vi.fn()
 
-        const id = await lambdaStore.launch()
+  describe("launch", () => {
+    test("successful launch", async () => {
+      setup()
+      setupConfig()
+      const lambdaStore = useLambdaStore()
+      const feedbackStore = useFeedbackStore()
 
-        expect(lambdaStore.status).toBe(Status.CONNECTED)
-        expect(id).toBe("test-id-123456")
-        expect(feedbackStore.server_error).toBe(false)
+      lambdaStore.base_url = "test-base-url"
+      registerEndpoint(lambdaStore.base_url, {
+        method: "POST",
+        handler: postFakeCall,
       })
+      postFakeCall.mockImplementation(() => ({ ID: TEST_ID }))
 
-      test("failed launch - error response", async () => {
-        const lambdaStore = useLambdaStore()
-        const feedbackStore = useFeedbackStore()
-
-        useRuntimeConfig().public.API_URL = "api.example.com"
-        useRuntimeConfig().public.SITE_BRANCH = "/test"
-        useRuntimeConfig().public.PROJECT = "/project"
+      const id = await lambdaStore.launch()
+      expect(lambdaStore.status).toBe(Status.CONNECTED)
+      expect(id).toBe(TEST_ID)
+      expect(feedbackStore.server_error).toBeFalsy()
+    })
 
-        registerEndpoint(lambdaStore.base_url, {
-          method: "POST",
-          handler: postFakeCall,
-        })
+    test("failed launch - error response", async () => {
+      setup()
+      setupConfig()
+      const lambdaStore = useLambdaStore()
+      const feedbackStore = useFeedbackStore()
 
-        postFakeCall.mockImplementation(() => {
-          throw createError({
-            status: 500,
-            statusMessage: "Internal Server Error",
-          })
+      registerEndpoint(lambdaStore.base_url, {
+        method: "POST",
+        handler: postFakeCall,
+      })
+      postFakeCall.mockImplementation(() => {
+        throw createError({
+          status: STATUS_500,
+          statusMessage: "Internal Server Error",
         })
-
-        await expect(lambdaStore.launch()).rejects.toThrow(
-          "Failed to launch lambda backend",
-        )
-
-        expect(lambdaStore.status).toBe(Status.NOT_CONNECTED)
-        expect(feedbackStore.server_error).toBe(true)
       })
-    })
 
-    describe("connect", () => {
-      test("successful connect", async () => {
-        const lambdaStore = useLambdaStore()
-        await lambdaStore.connect()
-        expect(lambdaStore.status).toBe(Status.CONNECTED)
-      })
+      await expect(lambdaStore.launch()).rejects.toThrow(
+        "Failed to launch lambda backend",
+      )
+      expect(lambdaStore.status).toBe(Status.NOT_CONNECTED)
+      expect(feedbackStore.server_error).toBeTruthy()
     })
   })
+
+  test("successful connect", async () => {
+    setup()
+    const lambdaStore = useLambdaStore()
+    await lambdaStore.connect()
+    expect(lambdaStore.status).toBe(Status.CONNECTED)
+  })
 })
diff --git a/tests/unit/stores/Treeview.nuxt.test.js b/tests/unit/stores/Treeview.nuxt.test.js
index dc29ebf7..07814591 100644
--- a/tests/unit/stores/Treeview.nuxt.test.js
+++ b/tests/unit/stores/Treeview.nuxt.test.js
@@ -1,66 +1,65 @@
-import { beforeEach, describe, expect, expectTypeOf, test, vi } from "vitest"
+import { describe, expect, expectTypeOf, test, vi } from "vitest"
 import { createTestingPinia } from "@pinia/testing"
 import { setActivePinia } from "pinia"
-
 import { useTreeviewStore } from "@ogw_front/stores/treeview"
 
-beforeEach(async () => {
-  const pinia = createTestingPinia({
-    stubActions: false,
-    createSpy: vi.fn,
-  })
+// CONSTANTS
+const STEP_1 = 1
+
+function setup() {
+  const pinia = createTestingPinia({ stubActions: false, createSpy: vi.fn })
   setActivePinia(pinia)
-})
+}
 
-describe("Treeview Store", () => {
-  describe("state", () => {
-    test("initial state", () => {
-      const treeviewStore = useTreeviewStore()
-      expectTypeOf(treeviewStore.items).toBeArray()
-    })
+describe("treeview store state", () => {
+  test("initial state", () => {
+    setup()
+    const treeviewStore = useTreeviewStore()
+    expectTypeOf(treeviewStore.items).toBeArray()
   })
+})
 
-  describe("actions", () => {
-    describe("addItem", () => {
-      test("test items sorted", () => {
-        const treeviewStore = useTreeviewStore()
+describe("treeview store actions", () => {
+  test("addItem sorted check", () => {
+    setup()
+    const treeviewStore = useTreeviewStore()
+    const testItems = [
+      {
+        geode_object_type: "BRep",
+        name: "test_brep.og_brep",
+        id: "1",
+        viewer_type: "model",
+      },
+      {
+        geode_object_type: "BRep",
+        name: "test_brep_2.og_brep",
+        id: "2",
+        viewer_type: "model",
+      },
+      {
+        geode_object_type: "EdgedCurve2D",
+        name: "test_edgedcurve.og_edc2d",
+        id: "2",
+        viewer_type: "mesh",
+      },
+    ]
 
-        const testItems = [
-          {
-            geode_object_type: "BRep",
-            name: "test_brep.og_brep",
-            id: "1",
-            viewer_type: "model",
-          },
-          {
-            geode_object_type: "BRep",
-            name: "test_brep_2.og_brep",
-            id: "2",
-            viewer_type: "model",
-          },
-          {
-            geode_object_type: "EdgedCurve2D",
-            name: "test_edgedcurve.og_edc2d",
-            id: "2",
-            viewer_type: "mesh",
-          },
-        ]
+    for (let i = 0; i < testItems.length; i += STEP_1) {
+      treeviewStore.addItem(
+        testItems[i].geode_object_type,
+        testItems[i].name,
+        testItems[i].id,
+        testItems[i].viewer_type,
+      )
+      const itemsCopy = [...treeviewStore.items]
+      expect(treeviewStore.items).toStrictEqual(itemsCopy.toSorted())
 
-        for (let i = 0; i < testItems.length; i++) {
-          treeviewStore.addItem(
-            testItems[i].geode_object_type,
-            testItems[i].name,
-            testItems[i].id,
-            testItems[i].viewer_type,
-          )
-          expect(treeviewStore.items.sort()).toBe(treeviewStore.items)
-          for (let i = 0; i < treeviewStore.items.length; i++) {
-            expect(treeviewStore.items[i].children.sort()).toBe(
-              treeviewStore.items[i].children,
-            )
-          }
-        }
-      })
-    })
+      for (let j = 0; j < treeviewStore.items.length; j += STEP_1) {
+        const childrenCopy = [...treeviewStore.items[j].children]
+        expect(treeviewStore.items[j].children).toStrictEqual(
+          childrenCopy.toSorted(),
+        )
+      }
+    }
   })
 })
diff --git a/tests/unit/stores/Viewer.nuxt.test.js b/tests/unit/stores/Viewer.nuxt.test.js
index 247af109..c98961d9 100644
--- a/tests/unit/stores/Viewer.nuxt.test.js
+++ b/tests/unit/stores/Viewer.nuxt.test.js
@@ -1,29 +1,25 @@
 // Global imports
-
-// Third party imports
-import { setActivePinia } from "pinia"
+import { describe, expect, expectTypeOf, test, vi } from "vitest"
+import { WebSocket } from "ws"
 import { createTestingPinia } from "@pinia/testing"
-import {
-  afterAll,
-  beforeAll,
-  describe,
-  test,
-  expect,
-  expectTypeOf,
-  beforeEach,
-  vi,
-} from "vitest"
+import { setActivePinia } from "pinia"
 
-import { WebSocket } from "ws"
 // Local imports
-import { useViewerStore } from "@ogw_front/stores/viewer"
-import { useInfraStore } from "@ogw_front/stores/infra"
 import { appMode } from "@ogw_front/utils/app_mode"
+import { useInfraStore } from "@ogw_front/stores/infra"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
+// CONSTANTS
+const PORT_443 = "443"
+const PORT_8080 = "8080"
+const PORT_1234 = "1234"
+const ID_VAL = "123456"
+const L1 = 1
+const L0 = 0
+const LN1 = -1
 
 // Mock navigator.locks API
-const mockLockRequest = vi.fn().mockImplementation(async (name, callback) => {
-  return callback({ name })
-})
+const mockLockRequest = vi.fn().mockImplementation((name, fn) => fn({ name }))
 
 vi.stubGlobal("navigator", {
   ...navigator,
@@ -32,155 +28,110 @@ vi.stubGlobal("navigator", {
   },
 })
 
-beforeAll(() => {
+function setup() {
+  const pinia = createTestingPinia({ stubActions: false, createSpy: vi.fn })
+  setActivePinia(pinia)
   global.WebSocket = WebSocket
-})
+}
 
-afterAll(() => {
-  delete global.WebSocket
+describe("viewer store state", () => {
+  test("initial state", () => {
+    setup()
+    const viewerStore = useViewerStore()
+    expectTypeOf(viewerStore.default_local_port).toBeString()
+    expectTypeOf(viewerStore.client).toEqualTypeOf({})
+    expectTypeOf(viewerStore.picking_mode).toBeBoolean()
+    expectTypeOf(viewerStore.picked_point).toEqualTypeOf({ x: null, y: null })
+    expectTypeOf(viewerStore.picked_point).toBeNumber()
+    expectTypeOf(viewerStore.status).toBeString()
+  })
 })
 
-beforeEach(() => {
-  const pinia = createTestingPinia({
-    stubActions: false,
-    createSpy: vi.fn,
+describe("viewer store mode getters", () => {
+  test("protocol and domain mapping", () => {
+    setup()
+    const infra = useInfraStore()
+    const viewer = useViewerStore()
+
+    infra.app_mode = appMode.CLOUD
+    expect(viewer.protocol).toBe("wss")
+    infra.app_mode = appMode.BROWSER
+    expect(viewer.protocol).toBe("ws")
+    infra.app_mode = appMode.DESKTOP
+    expect(viewer.protocol).toBe("ws")
+  })
+
+  test("port mapping", () => {
+    setup()
+    const infra = useInfraStore()
+    const viewer = useViewerStore()
+
+    infra.app_mode = appMode.CLOUD
+    expect(viewer.port).toBe(PORT_443)
+    infra.app_mode = appMode.BROWSER
+    expect(viewer.port).toBe(viewer.default_local_port)
+    infra.app_mode = appMode.DESKTOP
+    expect(viewer.port).toBe(viewer.default_local_port)
+
+    viewer.default_local_port = PORT_8080
+    expect(viewer.port).toBe(PORT_8080)
   })
-  setActivePinia(pinia)
 })
 
-describe("Viewer Store", () => {
-  describe("state", () => {
-    test("initial state", () => {
-      const viewerStore = useViewerStore()
-      expectTypeOf(viewerStore.default_local_port).toBeString()
-      expectTypeOf(viewerStore.client).toEqualTypeOf({})
-      expectTypeOf(viewerStore.picking_mode).toBeBoolean()
-      expectTypeOf(viewerStore.picked_point).toEqualTypeOf({
-        x: null,
-        y: null,
-      })
-      expectTypeOf(viewerStore.picked_point).toBeNumber()
-      expectTypeOf(viewerStore.status).toBeString()
-    })
+describe("viewer store url and busy getters", () => {
+  test("base_url construction", () => {
+    setup()
+    const infra = useInfraStore()
+    const viewer = useViewerStore()
+
+    infra.app_mode = appMode.DESKTOP
+    infra.domain_name = "localhost"
+    expect(viewer.base_url).toBe(`ws://localhost:${PORT_1234}/ws`)
+
+    infra.app_mode = appMode.CLOUD
+    infra.ID = ID_VAL
+    infra.domain_name = "example.com"
+    expect(viewer.base_url).toBe(
+      `wss://example.com:${PORT_443}/${ID_VAL}/viewer/ws`,
+    )
+  })
+
+  test("base_url error", () => {
+    setup()
+    const infra = useInfraStore()
+    const viewer = useViewerStore()
+    infra.app_mode = appMode.CLOUD
+    infra.ID = ""
+    infra.domain_name = "example.com"
+    expect(() => viewer.base_url).toThrow("ID must not be empty in cloud mode")
   })
 
-  describe("getters", () => {
-    describe("protocol", () => {
-      test("test app_mode CLOUD", () => {
-        const infraStore = useInfraStore()
-        const viewerStore = useViewerStore()
-        infraStore.app_mode = appMode.CLOUD
-        expect(viewerStore.protocol).toBe("wss")
-      })
-      test("test app_mode BROWSER", () => {
-        const infraStore = useInfraStore()
-        const viewerStore = useViewerStore()
-        infraStore.app_mode = appMode.BROWSER
-        expect(viewerStore.protocol).toBe("ws")
-      })
-      test("test app_mode DESKTOP", () => {
-        const infraStore = useInfraStore()
-        const viewerStore = useViewerStore()
-        infraStore.app_mode = appMode.DESKTOP
-        expect(viewerStore.protocol).toBe("ws")
-      })
-    })
-
-    describe("port", () => {
-      test("test app_mode CLOUD", () => {
-        const infraStore = useInfraStore()
-        const viewerStore = useViewerStore()
-        infraStore.app_mode = appMode.CLOUD
-        expect(viewerStore.port).toBe("443")
-      })
-      test("test app_mode BROWSER", () => {
-        const infraStore = useInfraStore()
-        const viewerStore = useViewerStore()
-        infraStore.app_mode = appMode.BROWSER
-        expect(viewerStore.port).toBe(viewerStore.default_local_port)
-      })
-      test("test app_mode DESKTOP", () => {
-        const infraStore = useInfraStore()
-        const viewerStore = useViewerStore()
-        infraStore.app_mode = appMode.DESKTOP
-        expect(viewerStore.port).toBe(viewerStore.default_local_port)
-      })
-
-      test("test override default_local_port", () => {
-        const infraStore = useInfraStore()
-        const viewerStore = useViewerStore()
-        infraStore.app_mode = appMode.DESKTOP
-        viewerStore.default_local_port = "8080"
-        expect(viewerStore.port).toBe("8080")
-      })
-    })
-    describe("base_url", () => {
-      test("test app_mode DESKTOP", () => {
-        const infraStore = useInfraStore()
-        const viewerStore = useViewerStore()
-        infraStore.app_mode = appMode.DESKTOP
-        infraStore.domain_name = "localhost"
-        expect(viewerStore.base_url).toBe("ws://localhost:1234/ws")
-      })
-
-      test("test app_mode CLOUD", () => {
-        const infraStore = useInfraStore()
-        const viewerStore = useViewerStore()
-        infraStore.app_mode = appMode.CLOUD
-        infraStore.ID = "123456"
-        infraStore.domain_name = "example.com"
-        expect(viewerStore.base_url).toBe(
-          "wss://example.com:443/123456/viewer/ws",
-        )
-      })
-
-      test("test app_mode CLOUD, ID empty", () => {
-        const infraStore = useInfraStore()
-        const viewerStore = useViewerStore()
-        infraStore.app_mode = appMode.CLOUD
-        infraStore.ID = ""
-        infraStore.domain_name = "example.com"
-        expect(() => viewerStore.base_url).toThrowError(
-          "ID must not be empty in cloud mode",
-        )
-      })
-    })
-    describe("is_busy", () => {
-      test("test is_busy", () => {
-        const viewerStore = useViewerStore()
-        viewerStore.request_counter = 1
-        expect(viewerStore.is_busy).toBe(true)
-      })
-      test("test not is_busy", () => {
-        const viewerStore = useViewerStore()
-        viewerStore.request_counter = 0
-        expect(viewerStore.is_busy).toBe(false)
-      })
-    })
+  test("busy status mapping", () => {
+    setup()
+    const viewer = useViewerStore()
+    viewer.request_counter = L1
+    expect(viewer.is_busy).toBeTruthy()
+    viewer.request_counter = L0
+    expect(viewer.is_busy).toBeFalsy()
   })
-  describe("actions", () => {
-    describe("toggle_picking_mode", () => {
-      test("test true", async () => {
-        const viewerStore = useViewerStore()
-        await viewerStore.toggle_picking_mode(true)
-        expect(viewerStore.picking_mode).toBe(true)
-      })
-    })
-
-    describe("start_request", () => {
-      test("test increment", async () => {
-        const viewerStore = useViewerStore()
-        await viewerStore.start_request()
-        expect(viewerStore.request_counter).toBe(1)
-      })
-    })
-
-    describe("stop_request", () => {
-      test("test decrement", async () => {
-        const viewerStore = useViewerStore()
-        await viewerStore.stop_request()
-        expect(viewerStore.request_counter).toBe(-1)
-      })
-    })
+})
+
+describe("viewer store actions", () => {
+  test("toggle_picking_mode", async () => {
+    setup()
+    const viewer = useViewerStore()
+    await viewer.toggle_picking_mode(true)
+    expect(viewer.picking_mode).toBeTruthy()
+  })
+
+  test("request counter updates", async () => {
+    setup()
+    const viewer = useViewerStore()
+    await viewer.start_request()
+    expect(viewer.request_counter).toBe(L1)
+    await viewer.stop_request()
+    expect(viewer.request_counter).toBe(L0)
+    await viewer.stop_request()
+    expect(viewer.request_counter).toBe(LN1)
   })
 })
diff --git a/tests/unit/utils/validate_schema.nuxt.test.js b/tests/unit/utils/validate_schema.nuxt.test.js
index 17472f58..d384e80c 100644
--- a/tests/unit/utils/validate_schema.nuxt.test.js
+++ b/tests/unit/utils/validate_schema.nuxt.test.js
@@ -1,38 +1,35 @@
 import { describe, expect, test } from "vitest"
-
 import validate_schema from "@ogw_front/utils/validate_schema"
 
-describe("validate_schema", () => {
+// CONSTANTS
+const MIN_0 = 0
+const MAX_10 = 10
+const VAL_5 = 5
+
+describe("validate schema", () => {
   const schema = {
     $id: "/test",
     type: "object",
     methods: ["POST"],
     properties: {
-      var_1: {
-        type: "string",
-      },
-      var_2: {
-        type: "integer",
-        minimum: 0,
-        maximum: 10,
-      },
+      var_1: { type: "string" },
+      var_2: { type: "integer", minimum: MIN_0, maximum: MAX_10 },
     },
     required: ["var_1", "var_2"],
     additionalProperties: false,
   }
-  var params
 
-  test("Ajv wrong params", async () => {
-    params = {}
-    var { valid, error } = validate_schema(schema, params)
-    expect(valid).toBe(false)
+  test("ajv wrong params", () => {
+    const params = {}
+    const { valid, error } = validate_schema(schema, params)
+    expect(valid).toBeFalsy()
     expect(error).toBe("data must have required property 'var_1'")
   })
 
-  test("Good params", async () => {
-    params = { var_1: "test", var_2: 5 }
-    var { valid, error } = validate_schema(schema, params)
-    expect(valid).toBe(true)
+  test("good params", () => {
+    const params = { var_1: "test", var_2: VAL_5 }
+    const { valid, error } = validate_schema(schema, params)
+    expect(valid).toBeTruthy()
     expect(error).toBe("No errors")
   })
 })
diff --git a/tests/utils.js b/tests/utils.js
index 7d35ce8e..4413c2b7 100644
--- a/tests/utils.js
+++ b/tests/utils.js
@@ -1,6 +1,6 @@
-import { createVuetify } from "vuetify"
 import * as components from "vuetify/components"
 import * as directives from "vuetify/directives"
+import { createVuetify } from "vuetify"
 const vuetify = createVuetify({ components, directives })
 
 export { vuetify }
diff --git a/tests/vitest.config.js b/tests/vitest.config.js
index 2b244291..0c324bf1 100644
--- a/tests/vitest.config.js
+++ b/tests/vitest.config.js
@@ -1,9 +1,13 @@
 import { defineConfig } from "vitest/config"
 import { defineVitestProject } from "@nuxt/test-utils/config"
-import path from "path"
+import path from "node:path"
 
-const globalRetry = process.env.CI ? 3 : 0
+const RETRIES = 3
+const DEFAULT_RETRY = 0
 
+const globalRetry = process.env.CI ? RETRIES : DEFAULT_RETRY
+
+// eslint-disable-next-line import/no-default-export
 export default defineConfig({
   test: {
     setupFiles: [path.resolve(__dirname, "./setup_indexeddb.js")],