Skip to content

Commit d8c31cb

Browse files
committed
Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Front into fix_draggable_contextmenu
2 parents ae71c27 + 31af4b8 commit d8c31cb

File tree

10 files changed

+25
-47
lines changed

10 files changed

+25
-47
lines changed

.github/workflows/config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"node": true,
3+
"integration": true,
4+
"microservices": "tests/integration/microservices"
5+
}

.github/workflows/test.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,6 @@ on:
77
- next
88

99
jobs:
10-
test-integration:
11-
runs-on: ubuntu-latest
12-
steps:
13-
- uses: actions/checkout@v4
14-
- name: Node setup
15-
uses: actions/setup-node@v4
16-
with:
17-
node-version: 22
18-
- name: Python setup
19-
uses: actions/setup-python@v5
20-
with:
21-
python-version: 3.12
22-
- name: Install python dependencies
23-
run: |
24-
cd ./tests/integration/microservices/viewer
25-
python3 -m venv venv
26-
source venv/bin/activate
27-
pip install --extra-index-url https://wheels.vtk.org -r requirements.txt
28-
- name: Install and run tests
29-
run: |
30-
npm i
31-
32-
npm run test:integration
3310
test:
3411
uses: Geode-solutions/actions/.github/workflows/js-test.yml@master
3512
with:

.github/workflows/test_pr.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ jobs:
99
uses: Geode-solutions/actions/.github/workflows/js-test-pr.yml@master
1010
with:
1111
repos: ${{ vars.REPOS }}
12-
integration: false
1312
secrets: inherit

components/HybridRenderingView.vue

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<VeaseViewToolbar />
55
<slot name="ui"></slot>
66
<v-col
7+
class="pa-0"
78
ref="viewer"
8-
style="overflow: hidden; position: relative; z-index: 0"
9-
:style="{ height: viewerHeight }"
9+
style="height: 100%; overflow: hidden; position: relative; z-index: 0"
1010
@click="get_x_y"
1111
@keydown.esc="viewerStore.toggle_picking_mode(false)"
1212
/>
@@ -15,13 +15,6 @@
1515
</template>
1616

1717
<script setup>
18-
const props = defineProps({
19-
height: {
20-
type: String,
21-
default: "100%",
22-
},
23-
})
24-
2518
const emit = defineEmits(["click"])
2619
2720
const container = useTemplateRef("viewer")
@@ -30,8 +23,6 @@
3023
const { windowWidth, windowHeight } = useWindowSize()
3124
const { width, height } = useElementSize(container)
3225
33-
const viewerHeight = computed(() => props.height)
34-
3526
const debouncedResize = debounce(() => {
3627
hybridViewerStore.resize(width.value, height.value)
3728
}, 100)
@@ -65,3 +56,9 @@
6556
emit("click", event)
6657
}
6758
</script>
59+
60+
<style>
61+
img {
62+
pointer-events: none;
63+
}
64+
</style>

components/Viewer/Generic/Mesh/EdgesOptions.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<ContextMenuItem
2+
<ViewerContextMenuItem
33
:itemProps="props.itemProps"
44
tooltip="Edges options"
55
:btn_image="props.btn_image"
@@ -14,7 +14,7 @@
1414
/>
1515
</template>
1616
</template>
17-
</ContextMenuItem>
17+
</ViewerContextMenuItem>
1818
</template>
1919

2020
<script setup>

components/Viewer/Generic/Mesh/PolygonsOptions.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<ContextMenuItem
2+
<ViewerContextMenuItem
33
:itemProps="props.itemProps"
44
:tooltip="props.tooltip"
55
:btn_image="props.btn_image"
@@ -17,7 +17,7 @@
1717
/>
1818
</template>
1919
</template>
20-
</ContextMenuItem>
20+
</ViewerContextMenuItem>
2121
</template>
2222

2323
<script setup>

components/Viewer/Generic/Mesh/PolyhedraOptions.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<ContextMenuItem
2+
<ViewerContextMenuItem
33
:itemProps="props.itemProps"
44
:tooltip="props.tooltip"
55
:btn_image="props.btn_image"
@@ -17,7 +17,7 @@
1717
/>
1818
</template>
1919
</template>
20-
</ContextMenuItem>
20+
</ViewerContextMenuItem>
2121
</template>
2222

2323
<script setup>

components/Viewer/Generic/Model/EdgesOptions.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<template>
2-
<ContextMenuItem
2+
<ViewerContextMenuItem
33
:itemProps="itemProps"
44
tooltip="Edges options"
55
:btn_image="SurfaceEdges"
66
>
77
<template #options>
88
<ViewerOptionsVisibilitySwitch v-model="visibility" />
99
</template>
10-
</ContextMenuItem>
10+
</ViewerContextMenuItem>
1111
</template>
1212

1313
<script setup>

components/Viewer/Generic/Model/PointsOptions.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<ContextMenuItem
2+
<ViewerContextMenuItem
33
:itemProps="props.itemProps"
44
tooltip="Points options"
55
:btn_image="SurfacePoints"
@@ -26,7 +26,7 @@
2626
</v-row>
2727
</template>
2828
</template>
29-
</ContextMenuItem>
29+
</ViewerContextMenuItem>
3030
</template>
3131

3232
<script setup>

components/Viewer/PointSet/SpecificPointsOptions.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<ContextMenuItem
2+
<ViewerContextMenuItem
33
:itemProps="props.itemProps"
44
tooltip="Points options"
55
:btn_image="props.btn_image"
@@ -36,7 +36,7 @@
3636
</v-row>
3737
</template>
3838
</template>
39-
</ContextMenuItem>
39+
</ViewerContextMenuItem>
4040
</template>
4141

4242
<script setup>

0 commit comments

Comments
 (0)