Skip to content

Commit 6402a07

Browse files
Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Front into test/integration_model
2 parents 2217f1b + e5ea82d commit 6402a07

File tree

5 files changed

+20
-1
lines changed

5 files changed

+20
-1
lines changed

components/Step.vue

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,14 @@
9090
function decrement_step() {
9191
stepper_tree.current_step_index--
9292
}
93+
94+
const sortedChips = computed(() => {
95+
const chips = steps.value[props.step_index]?.chips || []
96+
return [...chips].sort((a, b) =>
97+
a.localeCompare(b, undefined, {
98+
numeric: true,
99+
sensitivity: "base",
100+
}),
101+
)
102+
})
93103
</script>

components/Viewer/Tree/ObjectTree.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
>
1010
<div class="scrollable-wrapper">
1111
<v-sheet
12-
style="max-height: calc(90vh)"
12+
style="max-height: calc(85vh)"
1313
class="transparent-treeview scrollbar-hover"
1414
>
1515
<v-row v-if="treeviewStore.items.length > 0">

stores/treeview.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,16 @@ export const useTreeviewStore = defineStore("treeview", () => {
1515
function addItem(geodeObject, displayed_name, id, object_type) {
1616
dataStyleStore.addDataStyle(id, geodeObject, object_type)
1717
const child = { title: displayed_name, id, object_type }
18+
1819
for (let i = 0; i < items.value.length; i++) {
1920
if (items.value[i].title === geodeObject) {
2021
items.value[i].children.push(child)
22+
items.value[i].children.sort((a, b) =>
23+
a.title.localeCompare(b.title, undefined, {
24+
numeric: true,
25+
sensitivity: "base",
26+
}),
27+
)
2128
selection.value.push(child)
2229
return
2330
}

tests/integration/microservices/back/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
# pip-compile --output-file=tests/integration/microservices/back/requirements.txt tests/integration/microservices/back/requirements.in
66
#
77

8+
opengeodeweb-back==5.*,>=5.11.1rc1

tests/integration/microservices/viewer/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
# pip-compile --output-file=tests/integration/microservices/viewer/requirements.txt tests/integration/microservices/viewer/requirements.in
66
#
77

8+
opengeodeweb-viewer==1.*,>=1.11.6rc2

0 commit comments

Comments
 (0)