Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/components/HybridRenderingView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,13 @@ async function handleClick(event) {
</ClientOnly>
</template>

<style scoped>
:deep(img) {
pointer-events: none;
<style>
[data-testid="hybridViewer"] img {
pointer-events: none !important;
}
</style>

<style scoped>
.picking-cursor {
cursor: crosshair !important;
}
Expand Down
1 change: 1 addition & 0 deletions app/components/Viewer/ContextMenu/CenterButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ function onCenterClick(event) {
data-testid="circularMenuCenterButton"
icon
variant="outlined"
data-testid="circularMenuCenterButton"
class="central-selector-btn elevation-6"
style="width: 52px; height: 52px"
z-index="1"
Expand Down
2 changes: 1 addition & 1 deletion app/components/Viewer/EdgedCurve/SpecificEdgesOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const edge_attribute_color_map = computed({
<ViewerOptionsVisibilitySwitch data-testid="meshEdgesVisibilitySwitch" v-model="visibility" />
<template v-if="visibility">
<v-divider class="my-2" />
<ViewerOptionsWidthSlider v-model="width" />
<ViewerOptionsWidthSlider data-testid="meshEdgesWidthSlider" v-model="width" />
<ViewerOptionsColoringTypeSelector
:id="id"
v-model:coloring_style_key="coloring_style_key"
Expand Down
1 change: 1 addition & 0 deletions app/components/Viewer/Generic/Mesh/CellsOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ const cell_attribute_color_map = computed({
<template #options>
<ViewerOptionsVisibilitySwitch data-testid="meshCellsVisibilitySwitch" v-model="visibility" />
<template v-if="visibility">
<v-divider />
<ViewerOptionsColoringTypeSelector
:id="id"
v-model:coloring_style_key="coloring_style_key"
Expand Down
9 changes: 8 additions & 1 deletion app/components/Viewer/Generic/Mesh/EdgesOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,14 @@ const color = computed({
:btnImage="btnImage"
>
<template #options>
<ViewerOptionsVisibilitySwitch data-testid="meshEdgesVisibilitySwitch" v-model="visibility" />
<v-row>
<v-col>
<ViewerOptionsVisibilitySwitch
data-testid="meshEdgesVisibilitySwitch"
v-model="visibility"
/>
</v-col>
</v-row>
<template v-if="visibility">
<v-divider class="my-2" />
<ViewerOptionsWidthSlider data-testid="meshEdgesWidthSlider" v-model="size" />
Expand Down
12 changes: 8 additions & 4 deletions app/components/Viewer/Generic/Mesh/PointsOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,14 @@ const vertex_attribute_color_map = computed({
:btnImage="btnImage"
>
<template #options>
<ViewerOptionsVisibilitySwitch
data-testid="meshPointsVisibilitySwitch"
v-model="visibility"
/>
<v-row class="pa-1">
<v-col>
<ViewerOptionsVisibilitySwitch
data-testid="meshPointsVisibilitySwitch"
v-model="visibility"
/>
</v-col>
</v-row>
<template v-if="visibility">
<v-divider class="my-2" />
<ViewerOptionsSizeSlider data-testid="meshPointsSizeSlider" v-model="size" />
Expand Down
1 change: 1 addition & 0 deletions app/components/Viewer/Generic/Mesh/PolygonsOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ const textures = computed({
v-model="visibility"
/>
<template v-if="visibility">
<v-divider />
<ViewerOptionsColoringTypeSelector
:id="id"
v-model:coloring_style_key="coloring_style_key"
Expand Down
1 change: 1 addition & 0 deletions app/components/Viewer/Generic/Mesh/PolyhedraOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ const polyhedron_attribute_color_map = computed({
v-model="visibility"
/>
<template v-if="visibility">
<v-divider />
<ViewerOptionsColoringTypeSelector
:id="id"
v-model:coloring_style_key="coloring_style_key"
Expand Down
2 changes: 1 addition & 1 deletion app/components/Viewer/Generic/Model/BlocksOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ const polyhedronSchema = back_schemas.opengeodeweb_back.model_component_polyhedr

<template>
<OptionsSection title="Blocks Options" class="mt-4">
<VisibilitySwitch v-model="blocksVisibility" />
<VisibilitySwitch data-testid="modelBlocksVisibilitySwitch" v-model="blocksVisibility" />
<ViewerOptionsColoringTypeSelector
:id="modelId"
:componentId="targetBlockIds[0]"
Expand Down
2 changes: 1 addition & 1 deletion app/components/Viewer/Generic/Model/CornersOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ const vertexSchema = back_schemas.opengeodeweb_back.model_component_vertex_attri

<template>
<OptionsSection title="Corners Options" class="mt-4">
<VisibilitySwitch v-model="cornersVisibility" />
<VisibilitySwitch data-testid="modelCornersVisibilitySwitch" v-model="cornersVisibility" />
<ViewerOptionsColoringTypeSelector
:id="modelId"
:componentId="targetCornerIds[0]"
Expand Down
2 changes: 1 addition & 1 deletion app/components/Viewer/Generic/Model/LinesOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ const edgeSchema = back_schemas.opengeodeweb_back.model_component_edge_attribute

<template>
<OptionsSection title="Lines Options" class="mt-4">
<VisibilitySwitch v-model="linesVisibility" />
<VisibilitySwitch data-testid="modelLinesVisibilitySwitch" v-model="linesVisibility" />
<ViewerOptionsColoringTypeSelector
:id="modelId"
:componentId="targetLineIds[0]"
Expand Down
2 changes: 1 addition & 1 deletion app/components/Viewer/Generic/Model/ModelStyleCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ const modelComponentsColor = computed({
<template>
<v-sheet class="model-style-card" color="transparent">
<OptionsSection title="Model Options">
<VisibilitySwitch v-model="modelVisibility" />
<VisibilitySwitch data-testid="modelVisibilitySwitch" v-model="modelVisibility" />
</OptionsSection>

<OptionsSection v-if="!componentType && !componentId" title="Components Options" class="mt-4">
Expand Down
2 changes: 1 addition & 1 deletion app/components/Viewer/Generic/Model/SurfacesOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ const polygonSchema = back_schemas.opengeodeweb_back.model_component_polygon_att

<template>
<OptionsSection title="Surfaces Options" class="mt-4">
<VisibilitySwitch v-model="surfacesVisibility" />
<VisibilitySwitch data-testid="modelSurfacesVisibilitySwitch" v-model="surfacesVisibility" />
<ViewerOptionsColoringTypeSelector
:id="modelId"
:componentId="targetSurfaceIds[0]"
Expand Down
3 changes: 2 additions & 1 deletion app/components/Viewer/PointSet/SpecificPointsOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import PointSetPoints from "@ogw_front/assets/viewer_svgs/point_set_points.svg";
import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenu/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 { useBatchStyle } from "@ogw_front/composables/batch_style";
Expand Down Expand Up @@ -96,7 +97,7 @@ const vertex_attribute_color_map = computed({
/>
<template v-if="visibility">
<v-divider class="my-2" />
<ViewerOptionsSizeSlider v-model="size" />
<ViewerOptionsSizeSlider data-testid="meshPointsSizeSlider" v-model="size" />
<ViewerOptionsColoringTypeSelector
:id="id"
v-model:coloring_style_key="coloring_style_key"
Expand Down
10 changes: 7 additions & 3 deletions app/utils/local/cleanup.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,13 @@ function killHttpMicroservice(microservice) {
console.log("killHttpMicroservice", { ...microservice });
const failMessage = `Failed to kill ${microservice.name}`;
async function do_kill() {
await fetch(microservice.url, {
method: microservice.method,
});
try {
await $fetch(microservice.url, {
method: microservice.method,
});
} catch (error) {
console.log(`Expected error during kill of ${microservice.name}:`, error.message);
}
}
return pTimeout(do_kill(), {
milliseconds: 5000,
Expand Down
20 changes: 14 additions & 6 deletions app/utils/local/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,26 @@ async function waitForReady(child, expectedResponse) {
}

async function waitNuxt(nuxtProcess) {
nuxtProcess.stderr.on("data", (data) => {
console.log("Nuxt STDERR:", data.toString().trim());
});
nuxtProcess.on("close", (code) => {
console.log(`Nuxt process closed with code ${code}`);
});

for await (const [data] of on(nuxtProcess.stdout, "data")) {
const output = data.toString();
console.log("Nuxt:", output);
console.log("Nuxt STDOUT:", output.trim());
const portMatch = output.match(/Listening on http:\/\/\[::\]:(?<port>\d+)/u);
if (portMatch) {
const [, nuxtPort] = portMatch;

console.log("Nuxt listening on port", nuxtPort);
return nuxtPort;
console.log("Nuxt listening on port", portMatch.groups.port);
nuxtProcess.stdout.on("data", (newData) => {
console.log("Nuxt STDOUT:", newData.toString().trim());
});
return portMatch.groups.port;
}
}
throw new Error("Nuxt process closed without accepting connections");
throw new Error("Nuxt process closed");
}

async function runBrowser(scriptName) {
Expand Down
Loading