Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2fadbf0
test nuxt 4
JulienChampagnol Dec 4, 2025
1169eaf
Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWe…
JulienChampagnol Dec 4, 2025
3c0b5ea
test integration CI
JulienChampagnol Dec 5, 2025
6df6a45
integration tests okay
JulienChampagnol Dec 5, 2025
e63de95
wip unit tests
JulienChampagnol Dec 5, 2025
1ba8a6b
wip imports
JulienChampagnol Dec 8, 2025
1f18156
wip imports
JulienChampagnol Dec 8, 2025
4848d55
wip
JulienChampagnol Dec 9, 2025
fb302cf
Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWe…
JulienChampagnol Dec 9, 2025
165ebf7
Apply prepare changes
JulienChampagnol Dec 9, 2025
f3ed540
tests okay
JulienChampagnol Dec 9, 2025
b1a6922
Merge branch 'fix/nuxt_update' of https://github.com/Geode-solutions/…
JulienChampagnol Dec 9, 2025
0caa0f7
harmonize js imports & stores variables names
JulienChampagnol Dec 9, 2025
70bdff6
Apply prepare changes
JulienChampagnol Dec 9, 2025
9eb9cfd
fix(Nuxt): version 4
JulienChampagnol Dec 9, 2025
fe565ac
Merge branch 'fix/nuxt_update' of https://github.com/Geode-solutions/…
JulienChampagnol Dec 9, 2025
3ee0705
fix(Nuxt): version 4, all tests okay
JulienChampagnol Dec 10, 2025
b8206d8
Apply prepare changes
JulienChampagnol Dec 10, 2025
e0cd8ca
"nuxt": "4.2.2"
JulienChampagnol Dec 10, 2025
5898e21
Merge branch 'fix/nuxt_update' of https://github.com/Geode-solutions/…
JulienChampagnol Dec 10, 2025
4bfbee5
Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWe…
JulienChampagnol Dec 10, 2025
175358b
Apply prepare changes
JulienChampagnol Dec 10, 2025
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
1 change: 1 addition & 0 deletions app/components/CrsSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<script setup>
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
const schema = schemas.opengeodeweb_back.geographic_coordinate_systems
import { useGeodeStore } from "@ogw_front/stores/geode"

const emit = defineEmits([
"update_values",
Expand Down
3 changes: 2 additions & 1 deletion app/components/ExtensionSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@
<script setup>
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"

import FetchingData from "@ogw_front/components/FetchingData.vue"
import FetchingData from "@ogw_front/components/FetchingData"
import { useGeodeStore } from "@ogw_front/stores/geode"

const schema = schemas.opengeodeweb_back.geode_objects_and_output_extensions
const emit = defineEmits([
Expand Down
7 changes: 4 additions & 3 deletions app/components/FeedBack/ErrorBanner.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<v-banner
v-if="feedback_store.server_error"
v-if="feedbackStore.server_error"
elevation="2"
style="background-color: grey; z-index: 9999"
position="fixed"
Expand Down Expand Up @@ -33,7 +33,7 @@
size="20"
color="grey"
class=".align-center"
@click="feedback_store.delete_server_error()"
@click="feedbackStore.delete_server_error()"
>
<v-icon icon="mdi-close" size="20" color="white" />
</v-btn>
Expand All @@ -43,7 +43,8 @@
</template>

<script setup>
const feedback_store = useFeedbackStore()
import { useFeedbackStore } from "@ogw_front/stores/feedback"
const feedbackStore = useFeedbackStore()

function reload() {
window.location.reload()
Expand Down
8 changes: 5 additions & 3 deletions app/components/FeedBack/Snackers.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<v-snackbar
v-for="(feedback, index) in feedback_store.feedbacks"
v-for="(feedback, index) in feedbackStore.feedbacks"
:key="feedback"
v-model="show"
:style="{ 'margin-bottom': calc_margin(index) }"
Expand Down Expand Up @@ -51,7 +51,7 @@
variant="flat"
size="20"
:color="feedback.type"
@click="feedback_store.delete_feedback(feedback.id)"
@click="feedbackStore.delete_feedback(feedback.id)"
>
<v-icon icon="mdi-close" size="20" color="white" />
</v-btn>
Expand All @@ -61,7 +61,9 @@
</template>

<script setup>
const feedback_store = useFeedbackStore()
import { useFeedbackStore } from "@ogw_front/stores/feedback"

const feedbackStore = useFeedbackStore()
const show = true

function calc_margin(index) {
Expand Down
5 changes: 3 additions & 2 deletions app/components/FileSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
<script setup>
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"

import FetchingData from "@ogw_front/components/FetchingData.vue"
import FileUploader from "@ogw_front/components/FileUploader.vue"
import FetchingData from "@ogw_front/components/FetchingData"
import FileUploader from "@ogw_front/components/FileUploader"
import { useGeodeStore } from "@ogw_front/stores/geode"

const schema = schemas.opengeodeweb_back.allowed_files
const emit = defineEmits([
Expand Down
2 changes: 1 addition & 1 deletion app/components/FileUploader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

<script setup>
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
import { upload_file } from "@ogw_front/utils/upload_file.js"
import { upload_file } from "@ogw_front/utils/upload_file"
const schema = schemas.opengeodeweb_back.upload_file

const emit = defineEmits(["files_uploaded", "decrement_step"])
Expand Down
5 changes: 4 additions & 1 deletion app/components/HybridRenderingView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
</template>

<script setup>
import VeaseViewToolbar from "@ogw_front/components/VeaseViewToolbar.vue"
import VeaseViewToolbar from "@ogw_front/components/VeaseViewToolbar"

import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
import { useViewerStore } from "@ogw_front/stores/viewer"

const emit = defineEmits(["click"])

Expand Down
2 changes: 2 additions & 0 deletions app/components/InfraConnected.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
</template>

<script setup>
import { useInfraStore } from "@ogw_front/stores/infra"
const infraStore = useInfraStore()
console.log("TEST", { infraStore })
</script>
1 change: 1 addition & 0 deletions app/components/Inspector/InspectionButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

<script setup>
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
import { useGeodeStore } from "@ogw_front/stores/geode"
const schema = schemas.opengeodeweb_back.inspect_file

const emit = defineEmits([
Expand Down
2 changes: 1 addition & 1 deletion app/components/Inspector/ResultPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</template>

<script setup>
import InspectorResultPanel from "@ogw_front/components/Inspector/ResultPanel.vue"
import InspectorResultPanel from "@ogw_front/components/Inspector/ResultPanel"

const props = defineProps({
inspection_result: { type: Array, required: true },
Expand Down
17 changes: 9 additions & 8 deletions app/components/Launcher.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,34 @@
<v-container class="justify">
<v-row align-content="center" align="center">
<v-col
v-if="!infra_store.is_captcha_validated"
v-if="!infraStore.is_captcha_validated"
class="align"
cols="12"
align-self="center"
style="z-index: 1000"
>
<Recaptcha :color="'secondary'" />
</v-col>
<v-col v-else-if="infra_store.status == Status.CREATING">
<v-col v-else-if="infraStore.status == Status.CREATING">
<Loading />
</v-col>
</v-row>
</v-container>
</template>

<script setup>
import Status from "@ogw_front/utils/status.js"
import Loading from "@ogw_front/components/Loading.vue"
import Recaptcha from "@ogw_front/components/Recaptcha.vue"
import Status from "@ogw_front/utils/status"
import Loading from "@ogw_front/components/Loading"
import Recaptcha from "@ogw_front/components/Recaptcha"
import { useInfraStore } from "@ogw_front/stores/infra"

const infra_store = useInfraStore()
const infraStore = useInfraStore()

watch(
() => infra_store.is_captcha_validated,
() => infraStore.is_captcha_validated,
(value, oldValue) => {
if (value && !oldValue && import.meta.client) {
infra_store.create_backend()
infraStore.create_backend()
}
},
)
Expand Down
2 changes: 1 addition & 1 deletion app/components/Loading.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import derniere from "@ogw_front/assets/img/energy_sobriety/derniere.png"
import salon from "@ogw_front/assets/img/energy_sobriety/salon.png"

import Carousel from "@ogw_front/components/Carousel.vue"
import Carousel from "@ogw_front/components/Carousel"

const users_list = [
{
Expand Down
5 changes: 3 additions & 2 deletions app/components/MissingFilesSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@
<script setup>
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"

import FetchingData from "@ogw_front/components/FetchingData.vue"
import FileUploader from "@ogw_front/components/FileUploader.vue"
import FetchingData from "@ogw_front/components/FetchingData"
import FileUploader from "@ogw_front/components/FileUploader"
import { useGeodeStore } from "@ogw_front/stores/geode"

const schema = schemas.opengeodeweb_back.missing_files

Expand Down
13 changes: 8 additions & 5 deletions app/components/ObjectSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,22 @@
</template>

<script setup>
import geode_objects from "@ogw_front/assets/geode_objects"
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"

import geode_objects from "@ogw_front/assets/geode_objects"
import FetchingData from "@ogw_front/components/FetchingData.vue"
import { useGeodeStore } from "@ogw_front/stores/geode"

const schema = schemas.opengeodeweb_back.allowed_objects

const emit = defineEmits(["update_values", "increment_step"])

console.log("ObjectSelector")
const props = defineProps({
filenames: { type: Array, required: true },
supported_feature: { type: String, required: false, default: null },
})
const { filenames, supported_feature } = props

const geodeStore = useGeodeStore()
const { filenames } = props

const loading = ref(false)
const allowed_objects = ref({})
Expand Down Expand Up @@ -108,7 +110,7 @@
async function get_allowed_objects() {
toggle_loading()
allowed_objects.value = {}
const geodeStore = useGeodeStore()

const promise_array = filenames.map((filename) => {
return geodeStore.request(schema, { filename })
})
Expand Down Expand Up @@ -142,6 +144,7 @@
}

function set_geode_object(geode_object_type) {
console.log("set_geode_object", { geode_object_type })
if (geode_object_type) {
emit("update_values", { geode_object_type })
emit("increment_step")
Expand Down
3 changes: 2 additions & 1 deletion app/components/PackagesVersions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
</template>

<script setup>
import Status from "@ogw_front/utils/status.js"
import Status from "@ogw_front/utils/status"
import { useGeodeStore } from "@ogw_front/stores/geode"

const props = defineProps({
schema: { type: Object, required: true },
Expand Down
11 changes: 6 additions & 5 deletions app/components/Recaptcha.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
</template>

<script setup>
import { appMode } from "@ogw_front/utils/app_mode.js"
import { appMode } from "@ogw_front/utils/app_mode"
import { useInfraStore } from "@ogw_front/stores/infra"

const props = defineProps({
button_label: {
Expand All @@ -53,7 +54,7 @@
default: "white",
},
})
const infra_store = useInfraStore()
const infraStore = useInfraStore()
const name = ref("")
const email = ref("")
const launch = ref(false)
Expand All @@ -76,9 +77,9 @@
if (import.meta.client) {
if (
process.env.NODE_ENV !== "production" ||
infra_store.app_mode !== appMode.CLOUD
infraStore.app_mode !== appMode.CLOUD
) {
infra_store.$patch({ is_captcha_validated: true })
infraStore.$patch({ is_captcha_validated: true })
}
}
})
Expand All @@ -91,7 +92,7 @@
launch: launch.value,
},
})
infra_store.$patch({
infraStore.$patch({
is_captcha_validated: response.status === 200,
})
}
Expand Down
6 changes: 3 additions & 3 deletions app/components/RemoteRenderingView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
import vtkRemoteView from "@kitware/vtk.js/Rendering/Misc/RemoteView"
import { useElementSize, useWindowSize } from "@vueuse/core"
import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
import Status from "@ogw_front/utils/status.js"

import ViewToolbar from "@ogw_front/components/ViewToolbar.vue"
import Status from "@ogw_front/utils/status"
import ViewToolbar from "@ogw_front/components/ViewToolbar"
import { useViewerStore } from "@ogw_front/stores/viewer"

const props = defineProps({
viewId: { type: String, default: "-1" },
Expand Down
2 changes: 2 additions & 0 deletions app/components/Screenshot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@
import fileDownload from "js-file-download"
import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"

import { useViewerStore } from "@ogw_front/stores/viewer"

const emit = defineEmits(["close"])

const props = defineProps({
Expand Down
2 changes: 1 addition & 1 deletion app/components/Stepper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</template>

<script setup>
import Step from "@ogw_front/components/Step.vue"
import Step from "@ogw_front/components/Step"

const emit = defineEmits(["reset_values"])
const stepper_tree = inject("stepper_tree")
Expand Down
9 changes: 6 additions & 3 deletions app/components/VeaseViewToolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,14 @@
<script setup>
import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"

import Screenshot from "@ogw_front/components/Screenshot.vue"
import ZScaling from "@ogw_front/components/ZScaling.vue"
import Screenshot from "@ogw_front/components/Screenshot"
import ZScaling from "@ogw_front/components/ZScaling"

import { useViewerStore } from "@ogw_front/stores/viewer"
import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"

const hybridViewerStore = useHybridViewerStore()
const viewerStore = useViewerStore()
const take_screenshot = ref(false)
const showZScaling = ref(false)
const grid_scale = ref(false)
Expand Down Expand Up @@ -74,7 +78,6 @@
tooltip: "Toggle grid scale",
icon: "mdi-ruler-square",
action: () => {
const viewerStore = useViewerStore()
viewerStore.request(
schemas.opengeodeweb_viewer.viewer.grid_scale,
{ visibility: !grid_scale.value },
Expand Down
5 changes: 3 additions & 2 deletions app/components/ViewToolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
<script setup>
import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"

import Screenshot from "@ogw_front/components/Screenshot.vue"
import Screenshot from "@ogw_front/components/Screenshot"
import { useViewerStore } from "@ogw_front/stores/viewer"

const viewerStore = useViewerStore()
const take_screenshot = ref(false)
const grid_scale = ref(false)

Expand All @@ -33,7 +35,6 @@
tooltip: "Reset camera",
icon: "mdi-cube-scan",
action: () => {
const viewerStore = useViewerStore()
viewerStore.request(schemas.opengeodeweb_viewer.viewer.reset_camera)
},
},
Expand Down
1 change: 1 addition & 0 deletions app/components/Viewer/BreadCrumb.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
</template>

<script setup>
import { useTreeviewStore } from "@ogw_front/stores/treeview"
const treeviewStore = useTreeviewStore()

const selectedTree = computed(() => treeviewStore.selectedTree)
Expand Down
2 changes: 2 additions & 0 deletions app/components/Viewer/ContextMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
</template>

<script setup>
import { useMenuStore } from "@ogw_front/stores/menu"
import { useDataBaseStore } from "@ogw_front/stores/data_base"
const menuStore = useMenuStore()
const dataBaseStore = useDataBaseStore()

Expand Down
2 changes: 1 addition & 1 deletion app/components/Viewer/EdgedCurve/EdgesOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</template>

<script setup>
import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions.vue"
import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions"
import EdgedCurveEdges from "@ogw_front/assets/viewer_svgs/edged_curve_edges.svg"

const props = defineProps({
Expand Down
2 changes: 1 addition & 1 deletion app/components/Viewer/EdgedCurve/PointsOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</template>

<script setup>
import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions.vue"
import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions"
import EdgedCurvePoints from "@ogw_front/assets/viewer_svgs/edged_curve_points.svg"

const props = defineProps({
Expand Down
Loading