Skip to content

Commit c8d998a

Browse files
authored
Merge pull request #230 from Geode-solutions/fix/action-integration
Fix/action integration
2 parents 24e07ca + 69f33a7 commit c8d998a

File tree

3 files changed

+6
-35
lines changed

3 files changed

+6
-35
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,10 @@ 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:
3613
repos: ${{ vars.REPOS }}
14+
integration: true
15+
microservices_path: "tests/integration/microservices"
3716
secrets: inherit

.github/workflows/test_pr.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ jobs:
99
uses: Geode-solutions/actions/.github/workflows/js-test-pr.yml@master
1010
with:
1111
repos: ${{ vars.REPOS }}
12-
integration: false
12+
integration: true
13+
microservices_path: "tests/integration/microservices"
1314
secrets: inherit

components/HybridRenderingView.vue

Lines changed: 2 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)

0 commit comments

Comments
 (0)