Skip to content

Commit 9aed4c3

Browse files
authored
Merge pull request #282 from Geode-solutions/fix/treeview_breadcrumb
fix(Treeview): missing imports for model explorer
2 parents a751c18 + a24b4cc commit 9aed4c3

File tree

7 files changed

+16
-6
lines changed

7 files changed

+16
-6
lines changed

app/components/FeedBack/Snackers.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
import { useFeedbackStore } from "@ogw_front/stores/feedback"
6565
6666
const feedbackStore = useFeedbackStore()
67-
const show = true
67+
const show = ref(true)
6868
6969
function calc_margin(index) {
7070
return index * 60 + 8 + "px"

app/components/Viewer/BreadCrumb.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@
3737
</template>
3838

3939
<script setup>
40+
import { useDataBaseStore } from "@ogw_front/stores/data_base"
4041
import { useTreeviewStore } from "@ogw_front/stores/treeview"
42+
43+
const dataBaseStore = useDataBaseStore()
4144
const treeviewStore = useTreeviewStore()
4245
4346
const selectedTree = computed(() => treeviewStore.selectedTree)
@@ -48,9 +51,7 @@
4851
4952
const model_id = computed(() => treeviewStore.model_id)
5053
51-
const metaDatas = computed(() =>
52-
useDataBaseStore().itemMetaDatas(model_id.value),
53-
)
54+
const metaDatas = computed(() => dataBaseStore.itemMetaDatas(model_id.value))
5455
</script>
5556

5657
<style scoped>

app/components/Viewer/TreeComponent.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import { useDataBaseStore } from "@ogw_front/stores/data_base"
1919
import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
2020
21+
import { compareSelections } from "@ogw_front/utils/treeview"
22+
2123
const dataStyleStore = useDataStyleStore()
2224
const dataBaseStore = useDataBaseStore()
2325
const hybridViewerStore = useHybridViewerStore()

app/components/Viewer/TreeObject.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
import { useDataBaseStore } from "@ogw_front/stores/data_base"
4242
import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
4343
44+
import { compareSelections } from "@ogw_front/utils/treeview"
45+
4446
const treeviewStore = useTreeviewStore()
4547
const dataStyleStore = useDataStyleStore()
4648
const dataBaseStore = useDataBaseStore()

app/utils/treeview.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
function compareSelections(current, previous) {
2+
const added = current.filter((item) => !previous.includes(item))
3+
const removed = previous.filter((item) => !current.includes(item))
4+
return { added, removed }
5+
}
6+
7+
export { compareSelections }

tests/integration/microservices/back/requirements.txt

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

8-
opengeodeweb-back==5.*,>=5.14.2

tests/integration/microservices/viewer/requirements.txt

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

8-
opengeodeweb-viewer==1.*,>=1.13.2

0 commit comments

Comments
 (0)