@geode/opengeodeweb-front 10.14.2-rc.1 → 10.14.2-rc.2

package/app/components/Basic/Slider.vue

@@ -0,0 +1,7 @@
+<script setup>
+const model = defineModel();
+</script>
+
+<template>
+  <v-slider v-model="model" hide-details min="0" max="20" step="2" />
+</template>

package/app/components/Basic/Switch.vue

@@ -0,0 +1,7 @@
+<script setup>
+const model = defineModel();
+</script>
+
+<template>
+  <v-switch v-model="model" inset hide-details />
+</template>

package/app/components/HybridRenderingView.vue

@@ -46,7 +46,7 @@ function debounce(func, wait) {
 
 <template>
   <ClientOnly>
-    <div class="fill-height" style="position: relative; height: 100%">
+    <div data-testid="hybridViewer" class="fill-height" style="position: relative; height: 100%">
       <VeaseViewToolbar />
       <slot name="ui"></slot>
       <v-col

package/app/components/Viewer/EdgedCurve/SpecificEdgesOptions.vue

@@ -3,6 +3,7 @@ import EdgedCurveEdges from "@ogw_front/assets/viewer_svgs/edged_curve_edges.svg
 import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch";
+import ViewerOptionsWidthSlider from "@ogw_front/components/Viewer/Options/Sliders/Width";
 
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
@@ -23,7 +24,7 @@ const visibility = computed({
     hybridViewerStore.remoteRender();
   },
 });
-const size = computed({
+const width = computed({
   get: () => dataStyleStore.meshEdgesWidth(id.value),
   set: async (newValue) => {
     await dataStyleStore.setMeshEdgesWidth(id.value, newValue);
@@ -90,20 +91,15 @@ const edge_attribute_color_map = computed({
 <template>
   <ViewerContextMenuItem
     :itemProps="itemProps"
-    tooltip="Edges options"
     :btn_image="EdgedCurveEdges"
+    tooltip="Edges options"
   >
     <template #options>
-      <ViewerOptionsVisibilitySwitch v-model="visibility" />
+      <ViewerOptionsVisibilitySwitch data-testid="meshEdgesVisibilitySwitch" v-model="visibility" />
       <template v-if="visibility">
         <v-row class="pa-0" align="center">
           <v-divider />
-          <v-col cols="auto" justify="center">
-            <v-icon size="30" icon="mdi-ruler" v-tooltip:left="'Width'" />
-          </v-col>
-          <v-col justify="center">
-            <v-slider v-model="size" hide-details min="0" max="20" step="2" />
-          </v-col>
+          <ViewerOptionsWidthSlider v-model="width" />
         </v-row>
         <v-row>
           <v-col>

package/app/components/Viewer/Generic/Mesh/CellsOptions.vue

@@ -90,9 +90,14 @@ const cell_attribute_color_map = computed({
 </script>
 
 <template>
-  <ViewerContextMenuItem :itemProps="itemProps" :tooltip="tooltip" :btn_image="btn_image">
+  <ViewerContextMenuItem
+    data-testid="meshCellsMenu"
+    :itemProps="itemProps"
+    :tooltip="tooltip"
+    :btn_image="btn_image"
+  >
     <template #options>
-      <ViewerOptionsVisibilitySwitch v-model="visibility" />
+      <ViewerOptionsVisibilitySwitch data-testid="meshCellsVisibilitySwitch" v-model="visibility" />
       <template v-if="visibility">
         <ViewerOptionsColoringTypeSelector
           :id="id"

package/app/components/Viewer/Generic/Mesh/EdgesOptions.vue

@@ -2,6 +2,7 @@
 import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch";
+import ViewerOptionsWidthSlider from "@ogw_front/components/Viewer/Options/Sliders/Width";
 
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
@@ -9,9 +10,10 @@ import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
 const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
 
-const { itemProps, btn_image } = defineProps({
+const { itemProps, btn_image, tooltip } = defineProps({
   itemProps: { type: Object, required: true },
   btn_image: { type: String, required: true },
+  tooltip: { type: String, required: false, default: "Edges options" },
 });
 
 const id = toRef(() => itemProps.id);
@@ -89,18 +91,18 @@ const edge_attribute_color_map = computed({
 </script>
 
 <template>
-  <ViewerContextMenuItem :itemProps="itemProps" tooltip="Edges options" :btn_image="btn_image">
+  <ViewerContextMenuItem
+    data-testid="meshEdgesMenu"
+    :itemProps="itemProps"
+    :tooltip="tooltip"
+    :btn_image="btn_image"
+  >
     <template #options>
-      <ViewerOptionsVisibilitySwitch v-model="visibility" />
+      <ViewerOptionsVisibilitySwitch data-testid="meshEdgesVisibilitySwitch" v-model="visibility" />
       <template v-if="visibility">
         <v-row class="pa-0" align="center">
           <v-divider />
-          <v-col cols="auto" justify="center">
-            <v-icon size="30" icon="mdi-ruler" v-tooltip:left="'Width'" />
-          </v-col>
-          <v-col justify="center">
-            <v-slider v-model="size" hide-details min="0" max="20" step="2" />
-          </v-col>
+          <ViewerOptionsWidthSlider data-testid="meshEdgesWidthSlider" v-model="size" />
         </v-row>
         <v-row>
           <v-col>

package/app/components/Viewer/Generic/Mesh/PointsOptions.vue

@@ -1,6 +1,7 @@
 <script setup>
 import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem";
 import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector";
+import ViewerOptionsSizeSlider from "@ogw_front/components/Viewer/Options/Sliders/Size";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch";
 
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
@@ -9,9 +10,10 @@ import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
 const dataStyleStore = useDataStyleStore();
 const hybridViewerStore = useHybridViewerStore();
 
-const { itemProps, btn_image } = defineProps({
+const { itemProps, btn_image, tooltip } = defineProps({
   itemProps: { type: Object, required: true },
   btn_image: { type: String, required: true },
+  tooltip: { type: String, required: false, default: "Points options" },
 });
 
 const id = toRef(() => itemProps.id);
@@ -68,18 +70,21 @@ const vertex_attribute_color_map = computed({
 </script>
 
 <template>
-  <ViewerContextMenuItem :itemProps="itemProps" tooltip="Points options" :btn_image="btn_image">
+  <ViewerContextMenuItem
+    data-testid="meshPointsMenu"
+    :itemProps="itemProps"
+    :tooltip="tooltip"
+    :btn_image="btn_image"
+  >
     <template #options>
-      <ViewerOptionsVisibilitySwitch v-model="visibility" />
+      <ViewerOptionsVisibilitySwitch
+        data-testid="meshPointsVisibilitySwitch"
+        v-model="visibility"
+      />
       <template v-if="visibility">
         <v-row class="pa-0" align="center">
           <v-divider />
-          <v-col cols="auto" justify="center">
-            <v-icon size="30" icon="mdi-ruler" v-tooltip:left="'Size'" />
-          </v-col>
-          <v-col justify="center">
-            <v-slider v-model="size" hide-details min="0" max="20" step="2" />
-          </v-col>
+          <ViewerOptionsSizeSlider data-testid="meshPointsSizeSlider" v-model="size" />
         </v-row>
         <v-row>
           <v-col>

package/app/components/Viewer/Generic/Mesh/PolygonsOptions.vue

@@ -90,9 +90,17 @@ const polygon_attribute_color_map = computed({
 </script>
 
 <template>
-  <ViewerContextMenuItem :itemProps="itemProps" :tooltip="tooltip" :btn_image="btn_image">
+  <ViewerContextMenuItem
+    data-testid="meshPolygonsMenu"
+    :itemProps="itemProps"
+    :tooltip="tooltip"
+    :btn_image="btn_image"
+  >
     <template #options>
-      <ViewerOptionsVisibilitySwitch v-model="visibility" />
+      <ViewerOptionsVisibilitySwitch
+        data-testid="meshPolygonsVisibilitySwitch"
+        v-model="visibility"
+      />
       <template v-if="visibility">
         <ViewerOptionsColoringTypeSelector
           :id="id"

package/app/components/Viewer/Generic/Mesh/PolyhedraOptions.vue

@@ -87,9 +87,17 @@ const polyhedron_attribute_color_map = computed({
 </script>
 
 <template>
-  <ViewerContextMenuItem :itemProps="itemProps" :tooltip="tooltip" :btn_image="btn_image">
+  <ViewerContextMenuItem
+    data-testid="meshPolyhedraMenu"
+    :itemProps="itemProps"
+    :tooltip="tooltip"
+    :btn_image="btn_image"
+  >
     <template #options>
-      <ViewerOptionsVisibilitySwitch v-model="visibility" />
+      <ViewerOptionsVisibilitySwitch
+        data-testid="meshPolyhedraVisibilitySwitch"
+        v-model="visibility"
+      />
       <template v-if="visibility">
         <ViewerOptionsColoringTypeSelector
           :id="id"

package/app/components/Viewer/Generic/Model/PointsOptions.vue

@@ -1,6 +1,7 @@
 <script setup>
 import SurfacePoints from "@ogw_front/assets/viewer_svgs/surface_points.svg";
 import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem";
+import ViewerOptionsSizeSlider from "@ogw_front/components/Viewer/Options/Sliders/Size";
 import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch";
 
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
@@ -46,20 +47,7 @@ const size = computed({
       <template v-if="visibility">
         <v-row class="pa-0" align="center">
           <v-divider />
-          <v-col cols="auto" justify="center">
-            <v-icon size="30" icon="mdi-ruler" v-tooltip:left="'Size'" />
-          </v-col>
-          <v-col justify="center">
-            <v-slider
-              v-model="size"
-              hide-details
-              min="0"
-              max="20"
-              step="2"
-              thumb-color="black"
-              ticks
-            />
-          </v-col>
+          <ViewerOptionsSizeSlider data-testid="modelPointsSizeSlider" v-model="size" />
         </v-row>
       </template>
     </template>

package/app/components/Viewer/Options/Sliders/Size.vue

@@ -0,0 +1,8 @@
+<script setup>
+import Slider from "./Slider";
+const size = defineModel();
+</script>
+
+<template>
+  <Slider v-model="size" :tooltip="'Size'" />
+</template>

package/app/components/Viewer/Options/Sliders/Slider.vue

@@ -0,0 +1,17 @@
+<script setup>
+import BasicSlider from "@ogw_front/components/Basic/Slider";
+
+const model = defineModel();
+const { tooltip } = defineProps({
+  tooltip: { type: String, required: true },
+});
+</script>
+
+<template>
+  <v-col cols="auto" justify="center">
+    <v-icon size="30" icon="mdi-ruler" v-tooltip:left="tooltip" />
+  </v-col>
+  <v-col justify="center">
+    <BasicSlider v-model="model" />
+  </v-col>
+</template>

package/app/components/Viewer/Options/Sliders/Width.vue

@@ -0,0 +1,8 @@
+<script setup>
+import Slider from "./Slider";
+const width = defineModel();
+</script>
+
+<template>
+  <Slider v-model="width" :tooltip="'Width'" />
+</template>

package/app/components/Viewer/Options/VisibilitySwitch.vue

@@ -1,4 +1,6 @@
 <script setup>
+import BasicSwitch from "@ogw_front/components/Basic/Switch";
+
 const visibility = defineModel();
 </script>
 
@@ -8,7 +10,7 @@ const visibility = defineModel();
       <v-icon size="30" icon="mdi-eye" v-tooltip:left="'Visibility'" />
     </v-col>
     <v-col cols="auto" justify="center">
-      <v-switch v-model="visibility" inset hide-details />
+      <BasicSwitch v-model="visibility" />
     </v-col>
   </v-row>
 </template>

package/app/components/Viewer/PointSet/SpecificPointsOptions.vue

@@ -67,11 +67,7 @@ const vertex_attribute_color_map = computed({
 });
 </script>
 <template>
-  <ViewerContextMenuItem
-    :itemProps="itemProps"
-    tooltip="Points options"
-    :btn_image="PointSetPoints"
-  >
+  <ViewerContextMenuItem :itemProps="itemProps" :btn_image="PointSetPoints">
     <template #options>
       <ViewerOptionsVisibilitySwitch v-model="visibility" />
       <template v-if="visibility">

package/app/components/Viewer/Surface/Triangulated/TrianglesOptions.vue

@@ -0,0 +1,11 @@
+<script setup>
+import ViewerSpecificPolygonsOptions from "@ogw_front/components/Viewer/Surface/PolygonsOptions";
+
+const { itemProps } = defineProps({
+  itemProps: { type: Object, required: true },
+});
+</script>
+
+<template>
+  <ViewerSpecificPolygonsOptions :itemProps="itemProps" tooltip="Triangles options" />
+</template>

package/app/stores/menu.js

@@ -5,15 +5,13 @@ import PointSetPointsOptions from "@ogw_front/components/Viewer/PointSet/Specifi
 import EdgedCurveEdgesOptions from "@ogw_front/components/Viewer/EdgedCurve/SpecificEdgesOptions";
 import EdgedCurvePointsOptions from "@ogw_front/components/Viewer/EdgedCurve/PointsOptions";
 
-// PolygonalSurface components
-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";
+// Surface components
+import SurfaceEdgesOptions from "@ogw_front/components/Viewer/Surface/EdgesOptions";
+import SurfacePointsOptions from "@ogw_front/components/Viewer/Surface/PointsOptions";
+import SurfacePolygonsOptions from "@ogw_front/components/Viewer/Surface/PolygonsOptions";
 
 // TriangulatedSurface components
-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";
+import TriangulatedSurfaceTrianglesOptions from "@ogw_front/components/Viewer/Surface/Triangulated/TrianglesOptions";
 
 // Grid 2D components
 import Grid2DCellsOptions from "@ogw_front/components/Viewer/Grid/2D/CellsOptions";
@@ -44,15 +42,11 @@ const PointSet_menu = [PointSetPointsOptions];
 
 const EdgedCurve_menu = [EdgedCurvePointsOptions, EdgedCurveEdgesOptions];
 
-const PolygonalSurface_menu = [
-  PolygonalSurfacePointsOptions,
-  PolygonalSurfaceEdgesOptions,
-  PolygonalSurfacePolygonsOptions,
-];
+const PolygonalSurface_menu = [SurfacePointsOptions, SurfaceEdgesOptions, SurfacePolygonsOptions];
 
 const TriangulatedSurface_menu = [
-  TriangulatedSurfacePointsOptions,
-  TriangulatedSurfaceEdgesOptions,
+  SurfacePointsOptions,
+  SurfaceEdgesOptions,
   TriangulatedSurfaceTrianglesOptions,
 ];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.14.2-rc.1",
+  "version": "10.14.2-rc.2",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {

package/tests/integration/setup.js

@@ -19,6 +19,7 @@ import { useInfraStore } from "@ogw_front/stores/infra";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
 // Local constants
+const beforeAllTimeout = 40_000;
 const data_folder = path.join("tests", "integration", "data", "uploads");
 
 async function runMicroservices() {
@@ -88,4 +89,4 @@ afterAll(() => {
   delete globalThis.WebSocket;
 });
 
-export { runMicroservices, setupIntegrationTests };
+export { beforeAllTimeout, runMicroservices, setupIntegrationTests };

package/tests/integration/stores/data_style/mesh/cells.nuxt.test.js

@@ -3,14 +3,13 @@ import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" };
 
 // Local imports
+import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
 import { cleanupBackend } from "@ogw_front/utils/local/cleanup";
-import { setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
 // Local constants
-const INTERVAL_TIMEOUT = 60_000;
 const mesh_cells_schemas = viewer_schemas.opengeodeweb_viewer.mesh.cells;
 const file_name = "test.og_rgd2d";
 const geode_object = "RegularGrid2D";
@@ -25,7 +24,7 @@ describe("mesh cells", () => {
     id = "";
     projectFolderPath = "";
     ({ id, projectFolderPath } = await setupIntegrationTests(file_name, geode_object));
-  }, INTERVAL_TIMEOUT);
+  }, beforeAllTimeout);
 
   afterAll(async () => {
     console.log("afterAll mesh cells kill", projectFolderPath);

package/tests/integration/stores/data_style/mesh/edges.nuxt.test.js

@@ -3,14 +3,13 @@ import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" };
 
 // Local imports
+import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
 import { cleanupBackend } from "@ogw_front/utils/local/cleanup";
-import { setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
 // Local constants
-const INTERVAL_TIMEOUT = 25_000;
 const mesh_edges_schemas = viewer_schemas.opengeodeweb_viewer.mesh.edges;
 const file_name = "test.og_edc3d";
 const geode_object = "EdgedCurve3D";
@@ -23,7 +22,7 @@ let id = "",
 describe("mesh edges", () => {
   beforeAll(async () => {
     ({ id, projectFolderPath } = await setupIntegrationTests(file_name, geode_object));
-  }, INTERVAL_TIMEOUT);
+  }, beforeAllTimeout);
 
   afterAll(async () => {
     console.log("afterAll mesh edges kill", projectFolderPath);

package/tests/integration/stores/data_style/mesh/index.nuxt.test.js

@@ -3,14 +3,13 @@ import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" };
 
 // Local imports
+import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
 import { cleanupBackend } from "@ogw_front/utils/local/cleanup";
-import { setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
 // Local constants
-const INTERVAL_TIMEOUT = 20_000;
 const mesh_schemas = viewer_schemas.opengeodeweb_viewer.mesh;
 const file_name = "test.og_rgd3d";
 const geode_object = "RegularGrid3D";
@@ -21,7 +20,7 @@ let id = "",
 describe("mesh", () => {
   beforeAll(async () => {
     ({ id, projectFolderPath } = await setupIntegrationTests(file_name, geode_object));
-  }, INTERVAL_TIMEOUT);
+  }, beforeAllTimeout);
 
   afterAll(async () => {
     console.log("afterAll mesh index kill", projectFolderPath);

package/tests/integration/stores/data_style/mesh/points.nuxt.test.js

@@ -3,14 +3,13 @@ import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" };
 
 // Local imports
+import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
 import { cleanupBackend } from "@ogw_front/utils/local/cleanup";
-import { setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
 // Local constants
-const INTERVAL_TIMEOUT = 20_000;
 const mesh_points_schemas = viewer_schemas.opengeodeweb_viewer.mesh.points;
 const file_name = "test.og_edc2d";
 const geode_object = "EdgedCurve2D";
@@ -22,7 +21,7 @@ let id = "",
 describe("mesh points", () => {
   beforeAll(async () => {
     ({ id, projectFolderPath } = await setupIntegrationTests(file_name, geode_object));
-  }, INTERVAL_TIMEOUT);
+  }, beforeAllTimeout);
 
   afterAll(async () => {
     console.log("afterAll mesh points kill", projectFolderPath);

package/tests/integration/stores/data_style/mesh/polygons.nuxt.test.js

@@ -3,14 +3,13 @@ import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" };
 
 // Local imports
+import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
 import { cleanupBackend } from "@ogw_front/utils/local/cleanup";
-import { setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
 // Local constants
-const INTERVAL_TIMEOUT = 20_000;
 const mesh_polygons_schemas = viewer_schemas.opengeodeweb_viewer.mesh.polygons;
 const file_name = "test.og_psf3d";
 const geode_object = "PolygonalSurface3D";
@@ -23,7 +22,7 @@ let id = "",
 describe("mesh polygons", () => {
   beforeAll(async () => {
     ({ id, projectFolderPath } = await setupIntegrationTests(file_name, geode_object));
-  }, INTERVAL_TIMEOUT);
+  }, beforeAllTimeout);
 
   afterAll(async () => {
     console.log("afterAll mesh polygons kill", projectFolderPath);

package/tests/integration/stores/data_style/mesh/polyhedra.nuxt.test.js

@@ -3,14 +3,13 @@ import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" };
 
 // Local imports
+import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
 import { cleanupBackend } from "@ogw_front/utils/local/cleanup";
-import { setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
 // Local constants
-const INTERVAL_TIMEOUT = 20_000;
 const mesh_polyhedra_schemas = viewer_schemas.opengeodeweb_viewer.mesh.polyhedra;
 const file_name = "test.vtu";
 const geode_object = "HybridSolid3D";
@@ -23,7 +22,7 @@ let id = "",
 describe("mesh polyhedra", () => {
   beforeAll(async () => {
     ({ id, projectFolderPath } = await setupIntegrationTests(file_name, geode_object));
-  }, INTERVAL_TIMEOUT);
+  }, beforeAllTimeout);
 
   afterAll(async () => {
     console.log("afterAll mesh cells kill", projectFolderPath);

package/tests/integration/stores/data_style/model/blocks.nuxt.test.js

@@ -3,15 +3,14 @@ import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" };
 
 // Local imports
+import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
 import { cleanupBackend } from "@ogw_front/utils/local/cleanup";
-import { setupIntegrationTests } from "@ogw_tests/integration/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 = 20_000;
 const model_blocks_schemas = viewer_schemas.opengeodeweb_viewer.model.blocks;
 const file_name = "test.og_brep";
 const geode_object = "BRep";
@@ -30,7 +29,7 @@ let id = "",
 describe("model blocks", () => {
   beforeAll(async () => {
     ({ id, projectFolderPath } = await setupIntegrationTests(file_name, geode_object));
-  }, INTERVAL_TIMEOUT);
+  }, beforeAllTimeout);
 
   afterAll(async () => {
     console.log("afterAll model blocks kill", projectFolderPath);

package/tests/integration/stores/data_style/model/corners.nuxt.test.js

@@ -3,15 +3,14 @@ import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" };
 
 // Local imports
+import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
 import { cleanupBackend } from "@ogw_front/utils/local/cleanup";
-import { setupIntegrationTests } from "@ogw_tests/integration/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 = 20_000;
 const model_corners_schemas = viewer_schemas.opengeodeweb_viewer.model.corners;
 const file_name = "test.og_brep";
 const geode_object = "BRep";
@@ -30,7 +29,7 @@ let id = "",
 describe("model corners", () => {
   beforeAll(async () => {
     ({ id, projectFolderPath } = await setupIntegrationTests(file_name, geode_object));
-  }, INTERVAL_TIMEOUT);
+  }, beforeAllTimeout);
 
   afterAll(async () => {
     console.log("afterAll model corners kill", projectFolderPath);

package/tests/integration/stores/data_style/model/edges.nuxt.test.js

@@ -3,14 +3,13 @@ import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" };
 
 // Local imports
+import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
 import { cleanupBackend } from "@ogw_front/utils/local/cleanup";
-import { setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
 // Local constants
-const INTERVAL_TIMEOUT = 25_000;
 const model_edges_schemas = viewer_schemas.opengeodeweb_viewer.model.edges;
 const file_name = "test.og_brep";
 const geode_object = "BRep";
@@ -29,7 +28,7 @@ let id = "",
 describe("model edges", () => {
   beforeAll(async () => {
     ({ id, projectFolderPath } = await setupIntegrationTests(file_name, geode_object));
-  }, INTERVAL_TIMEOUT);
+  }, beforeAllTimeout);
 
   afterAll(async () => {
     console.log("afterAll model edges kill", projectFolderPath);

package/tests/integration/stores/data_style/model/index.nuxt.test.js

@@ -3,14 +3,13 @@ import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" };
 
 // Local imports
+import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
 import { cleanupBackend } from "@ogw_front/utils/local/cleanup";
-import { setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
 // Local constants
-const INTERVAL_TIMEOUT = 20_000;
 const model_schemas = viewer_schemas.opengeodeweb_viewer.model;
 const file_name = "test.og_brep";
 const geode_object = "BRep";
@@ -29,7 +28,7 @@ let id = "",
 describe("model", () => {
   beforeAll(async () => {
     ({ id, projectFolderPath } = await setupIntegrationTests(file_name, geode_object));
-  }, INTERVAL_TIMEOUT);
+  }, beforeAllTimeout);
 
   afterAll(async () => {
     console.log("afterAll model kill", projectFolderPath);

package/tests/integration/stores/data_style/model/lines.nuxt.test.js

@@ -3,15 +3,14 @@ import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" };
 
 // Local imports
+import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
 import { cleanupBackend } from "@ogw_front/utils/local/cleanup";
-import { setupIntegrationTests } from "@ogw_tests/integration/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 = 20_000;
 const model_lines_schemas = viewer_schemas.opengeodeweb_viewer.model.lines;
 const file_name = "test.og_brep";
 const geode_object = "BRep";
@@ -30,7 +29,7 @@ let id = "",
 describe("model lines", () => {
   beforeAll(async () => {
     ({ id, projectFolderPath } = await setupIntegrationTests(file_name, geode_object));
-  }, INTERVAL_TIMEOUT);
+  }, beforeAllTimeout);
 
   afterAll(async () => {
     console.log("afterAll model lines kill", projectFolderPath);

package/tests/integration/stores/data_style/model/points.nuxt.test.js

@@ -3,14 +3,13 @@ import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" };
 
 // Local imports
+import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
 import { cleanupBackend } from "@ogw_front/utils/local/cleanup";
-import { setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { useDataStyleStore } from "@ogw_front/stores/data_style";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
 // Local constants
-const INTERVAL_TIMEOUT = 20_000;
 const model_points_schemas = viewer_schemas.opengeodeweb_viewer.model.points;
 const file_name = "test.og_brep";
 const geode_object = "BRep";
@@ -29,7 +28,7 @@ let id = "",
 describe("model points", () => {
   beforeAll(async () => {
     ({ id, projectFolderPath } = await setupIntegrationTests(file_name, geode_object));
-  }, INTERVAL_TIMEOUT);
+  }, beforeAllTimeout);
 
   afterAll(async () => {
     console.log("afterAll model points kill", projectFolderPath);

package/tests/integration/stores/data_style/model/surfaces.nuxt.test.js

@@ -3,15 +3,14 @@ import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" };
 
 // Local imports
+import { beforeAllTimeout, setupIntegrationTests } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
 import { cleanupBackend } from "@ogw_front/utils/local/cleanup";
-import { setupIntegrationTests } from "@ogw_tests/integration/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 = 20_000;
 const model_surfaces_schemas = viewer_schemas.opengeodeweb_viewer.model.surfaces;
 const file_name = "test.og_brep";
 const geode_object = "BRep";
@@ -30,7 +29,7 @@ let id = "",
 describe("model surfaces", () => {
   beforeAll(async () => {
     ({ id, projectFolderPath } = await setupIntegrationTests(file_name, geode_object));
-  }, INTERVAL_TIMEOUT);
+  }, beforeAllTimeout);
 
   afterAll(async () => {
     console.log("afterAll model surfaces kill", projectFolderPath);

package/tests/integration/stores/viewer.nuxt.test.js

@@ -5,9 +5,9 @@ import { afterAll, beforeAll, describe, expect, test } from "vitest";
 import opengeodeweb_viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 // Local imports
+import { beforeAllTimeout, runMicroservices } from "@ogw_tests/integration/setup";
 import { Status } from "@ogw_front/utils/status";
 import { cleanupBackend } from "@ogw_front/utils/local/cleanup";
-import { runMicroservices } from "@ogw_tests/integration/setup";
 import { setupActivePinia } from "@ogw_tests/utils";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
@@ -19,7 +19,7 @@ describe("viewer Store", () => {
   beforeAll(async () => {
     setupActivePinia();
     ({ projectFolderPath } = await runMicroservices());
-  });
+  }, beforeAllTimeout);
 
   afterAll(async () => {
     await cleanupBackend(projectFolderPath);

package/app/components/Viewer/HybridSolid/EdgesOptions.vue

@@ -1,12 +0,0 @@
-<script setup>
-import HybridSolidEdges from "@ogw_front/assets/viewer_svgs/solid_edges.svg";
-import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions";
-
-const { itemProps } = defineProps({
-  itemProps: { type: Object, required: true },
-});
-</script>
-
-<template>
-  <ViewerGenericMeshEdgesOptions :itemProps="itemProps" :btn_image="HybridSolidEdges" />
-</template>

package/app/components/Viewer/HybridSolid/PointsOptions.vue

@@ -1,12 +0,0 @@
-<script setup>
-import HybridSolidPoints from "@ogw_front/assets/viewer_svgs/solid_points.svg";
-import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions";
-
-const { itemProps } = defineProps({
-  itemProps: { type: Object, required: true },
-});
-</script>
-
-<template>
-  <ViewerGenericMeshPointsOptions :itemProps="itemProps" :btn_image="HybridSolidPoints" />
-</template>

package/app/components/Viewer/HybridSolid/PolygonsOptions.vue

@@ -1,12 +0,0 @@
-<script setup>
-import HybridSolidPolygons from "@ogw_front/assets/viewer_svgs/solid_facets.svg";
-import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions";
-
-const { itemProps } = defineProps({
-  itemProps: { type: Object, required: true },
-});
-</script>
-
-<template>
-  <ViewerGenericMeshPolygonsOptions :itemProps="itemProps" :btn_image="HybridSolidPolygons" />
-</template>

package/app/components/Viewer/HybridSolid/PolyhedraOptions.vue

@@ -1,12 +0,0 @@
-<script setup>
-import HybridSolidPolyhedra from "@ogw_front/assets/viewer_svgs/solid_polyhedra.svg";
-import ViewerGenericMeshPolyhedraOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolyhedraOptions";
-
-const { itemProps } = defineProps({
-  itemProps: { type: Object, required: true },
-});
-</script>
-
-<template>
-  <ViewerGenericMeshPolyhedraOptions :itemProps="itemProps" :btn_image="HybridSolidPolyhedra" />
-</template>

package/app/components/Viewer/PolygonalSurface/EdgesOptions.vue

@@ -1,12 +0,0 @@
-<script setup>
-import PolygonalSurfaceEdges from "@ogw_front/assets/viewer_svgs/surface_edges.svg";
-import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions";
-
-const { itemProps } = defineProps({
-  itemProps: { type: Object, required: true },
-});
-</script>
-
-<template>
-  <ViewerGenericMeshEdgesOptions :itemProps="itemProps" :btn_image="PolygonalSurfaceEdges" />
-</template>

package/app/components/Viewer/PolygonalSurface/PointsOptions.vue

@@ -1,12 +0,0 @@
-<script setup>
-import PolygonalSurfacePoints from "@ogw_front/assets/viewer_svgs/surface_points.svg";
-import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions";
-
-const { itemProps } = defineProps({
-  itemProps: { type: Object, required: true },
-});
-</script>
-
-<template>
-  <ViewerGenericMeshPointsOptions :itemProps="itemProps" :btn_image="PolygonalSurfacePoints" />
-</template>

package/app/components/Viewer/TriangulatedSurface/TrianglesOptions.vue

@@ -1,16 +0,0 @@
-<script setup>
-import TriangulatedSurfaceTriangles from "@ogw_front/assets/viewer_svgs/surface_triangles.svg";
-import ViewerSpecificPolygonsOptions from "@ogw_front/components/Viewer/PolygonalSurface/SpecificPolygonsOptions";
-
-const { itemProps } = defineProps({
-  itemProps: { type: Object, required: true },
-});
-</script>
-
-<template>
-  <ViewerSpecificPolygonsOptions
-    :itemProps="itemProps"
-    :btn_image="TriangulatedSurfaceTriangles"
-    tooltip="Triangles options"
-  />
-</template>

package/tests/integration/microservices/back/requirements.txt

@@ -1,7 +0,0 @@
-#
-# This file is autogenerated by pip-compile with Python 3.12
-# by the following command:
-#
-#    pip-compile --output-file=tests/integration/microservices/back/requirements.txt tests/integration/microservices/back/requirements.in
-#
-

package/tests/integration/microservices/viewer/requirements.txt

@@ -1,7 +0,0 @@
-#
-# This file is autogenerated by pip-compile with Python 3.12
-# by the following command:
-#
-#    pip-compile --output-file=tests/integration/microservices/viewer/requirements.txt tests/integration/microservices/viewer/requirements.in
-#
-