Skip to content

Commit 53c7e01

Browse files
JulienChampagnolJulienChampagnol
authored
Merge pull request #189 from Geode-solutions/next
Next
2 parents c9ac647 + 5ae5046 commit 53c7e01

39 files changed

+19537
-190
lines changed

‎.github/workflows/CICD.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: actions/checkout@v4
1212
- name: Unit tests
1313
run: |
14-
npm i
14+
npm ci
1515
npm run test
1616
1717
build:

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ logs
2626
.pytest_cache
2727
__snapshots__
2828
coverage
29-
package-lock.json
29+
# package-lock.json

‎assets/geode_objects.js

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
import BRep from "@/assets/img/geode_objects/BRep.svg"
2-
import CrossSection from "@/assets/img/geode_objects/CrossSection.svg"
3-
import EdgedCurve2D from "@/assets/img/geode_objects/EdgedCurve2D.svg"
4-
import EdgedCurve3D from "@/assets/img/geode_objects/EdgedCurve3D.svg"
5-
import Graph from "@/assets/img/geode_objects/Graph.svg"
6-
import HybridSolid3D from "@/assets/img/geode_objects/HybridSolid3D.svg"
7-
import ImplicitCrossSection from "@/assets/img/geode_objects/ImplicitCrossSection.svg"
8-
import ImplicitStructuralModel from "@/assets/img/geode_objects/ImplicitStructuralModel.svg"
9-
import LightRegularGrid2D from "@/assets/img/geode_objects/LightRegularGrid2D.svg"
10-
import LightRegularGrid3D from "@/assets/img/geode_objects/LightRegularGrid3D.svg"
11-
import PointSet2D from "@/assets/img/geode_objects/PointSet2D.svg"
12-
import PointSet3D from "@/assets/img/geode_objects/PointSet3D.svg"
13-
import PolygonalSurface2D from "@/assets/img/geode_objects/PolygonalSurface2D.svg"
14-
import PolygonalSurface3D from "@/assets/img/geode_objects/PolygonalSurface3D.svg"
15-
import PolyhedralSolid3D from "@/assets/img/geode_objects/PolyhedralSolid3D.svg"
16-
import RasterImage2D from "@/assets/img/geode_objects/RasterImage2D.svg"
17-
import RasterImage3D from "@/assets/img/geode_objects/RasterImage3D.svg"
18-
import RegularGrid2D from "@/assets/img/geode_objects/RegularGrid2D.svg"
19-
import RegularGrid3D from "@/assets/img/geode_objects/RegularGrid3D.svg"
20-
import Section from "@/assets/img/geode_objects/Section.svg"
21-
import StructuralModel from "@/assets/img/geode_objects/StructuralModel.svg"
22-
import TetrahedralSolid3D from "@/assets/img/geode_objects/TetrahedralSolid3D.svg"
23-
import TriangulatedSurface2D from "@/assets/img/geode_objects/TriangulatedSurface2D.svg"
24-
import TriangulatedSurface3D from "@/assets/img/geode_objects/TriangulatedSurface3D.svg"
25-
import VertexSet from "@/assets/img/geode_objects/VertexSet.svg"
1+
import BRep from "@ogw_f/assets/img/geode_objects/BRep.svg"
2+
import CrossSection from "@ogw_f/assets/img/geode_objects/CrossSection.svg"
3+
import EdgedCurve2D from "@ogw_f/assets/img/geode_objects/EdgedCurve2D.svg"
4+
import EdgedCurve3D from "@ogw_f/assets/img/geode_objects/EdgedCurve3D.svg"
5+
import Graph from "@ogw_f/assets/img/geode_objects/Graph.svg"
6+
import HybridSolid3D from "@ogw_f/assets/img/geode_objects/HybridSolid3D.svg"
7+
import ImplicitCrossSection from "@ogw_f/assets/img/geode_objects/ImplicitCrossSection.svg"
8+
import ImplicitStructuralModel from "@ogw_f/assets/img/geode_objects/ImplicitStructuralModel.svg"
9+
import LightRegularGrid2D from "@ogw_f/assets/img/geode_objects/LightRegularGrid2D.svg"
10+
import LightRegularGrid3D from "@ogw_f/assets/img/geode_objects/LightRegularGrid3D.svg"
11+
import PointSet2D from "@ogw_f/assets/img/geode_objects/PointSet2D.svg"
12+
import PointSet3D from "@ogw_f/assets/img/geode_objects/PointSet3D.svg"
13+
import PolygonalSurface2D from "@ogw_f/assets/img/geode_objects/PolygonalSurface2D.svg"
14+
import PolygonalSurface3D from "@ogw_f/assets/img/geode_objects/PolygonalSurface3D.svg"
15+
import PolyhedralSolid3D from "@ogw_f/assets/img/geode_objects/PolyhedralSolid3D.svg"
16+
import RasterImage2D from "@ogw_f/assets/img/geode_objects/RasterImage2D.svg"
17+
import RasterImage3D from "@ogw_f/assets/img/geode_objects/RasterImage3D.svg"
18+
import RegularGrid2D from "@ogw_f/assets/img/geode_objects/RegularGrid2D.svg"
19+
import RegularGrid3D from "@ogw_f/assets/img/geode_objects/RegularGrid3D.svg"
20+
import Section from "@ogw_f/assets/img/geode_objects/Section.svg"
21+
import StructuralModel from "@ogw_f/assets/img/geode_objects/StructuralModel.svg"
22+
import TetrahedralSolid3D from "@ogw_f/assets/img/geode_objects/TetrahedralSolid3D.svg"
23+
import TriangulatedSurface2D from "@ogw_f/assets/img/geode_objects/TriangulatedSurface2D.svg"
24+
import TriangulatedSurface3D from "@ogw_f/assets/img/geode_objects/TriangulatedSurface3D.svg"
25+
import VertexSet from "@ogw_f/assets/img/geode_objects/VertexSet.svg"
2626

2727
const geode_objects = {
2828
BRep: {

‎components/FileUploader.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
await Promise.all(promise_array)
8181
files_uploaded.value = true
8282
emit("files_uploaded", internal_files.value)
83+
8384
toggle_loading()
8485
}
8586

‎components/Launcher.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</template>
2020

2121
<script setup>
22-
import Status from "@/utils/status.js"
22+
import Status from "@ogw_f/utils/status.js"
2323
2424
const infra_store = use_infra_store()
2525
const site_key = useRuntimeConfig().public.RECAPTCHA_SITE_KEY

‎components/Loading.vue

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@
2525
</template>
2626

2727
<script setup>
28-
import ying_yang from "@/assets/img/energy_sobriety/ying_yang.png"
29-
import chemin from "@/assets/img/energy_sobriety/chemin.png"
30-
import vert from "@/assets/img/energy_sobriety/vert.png"
31-
import lampadaire from "@/assets/img/energy_sobriety/lampadaire.png"
32-
import collegue from "@/assets/img/energy_sobriety/collegue.png"
33-
import sobene from "@/assets/img/energy_sobriety/sobene.png"
34-
import etincelle from "@/assets/img/energy_sobriety/etincelle.png"
35-
import geste from "@/assets/img/energy_sobriety/geste.png"
36-
import socle from "@/assets/img/energy_sobriety/socle.png"
37-
import derniere from "@/assets/img/energy_sobriety/derniere.png"
38-
import salon from "@/assets/img/energy_sobriety/salon.png"
28+
import ying_yang from "@ogw_f/assets/img/energy_sobriety/ying_yang.png"
29+
import chemin from "@ogw_f/assets/img/energy_sobriety/chemin.png"
30+
import vert from "@ogw_f/assets/img/energy_sobriety/vert.png"
31+
import lampadaire from "@ogw_f/assets/img/energy_sobriety/lampadaire.png"
32+
import collegue from "@ogw_f/assets/img/energy_sobriety/collegue.png"
33+
import sobene from "@ogw_f/assets/img/energy_sobriety/sobene.png"
34+
import etincelle from "@ogw_f/assets/img/energy_sobriety/etincelle.png"
35+
import geste from "@ogw_f/assets/img/energy_sobriety/geste.png"
36+
import socle from "@ogw_f/assets/img/energy_sobriety/socle.png"
37+
import derniere from "@ogw_f/assets/img/energy_sobriety/derniere.png"
38+
import salon from "@ogw_f/assets/img/energy_sobriety/salon.png"
3939
4040
const users_list = [
4141
{

‎components/ObjectSelector.vue

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</template>
5050

5151
<script setup>
52-
import geode_objects from "@/assets/geode_objects"
52+
import geode_objects from "@ogw_f/assets/geode_objects"
5353
import schemas from "@geode/opengeodeweb-back/schemas.json"
5454
5555
const schema = schemas.opengeodeweb_back.allowed_objects
@@ -72,25 +72,14 @@
7272
var promise_array = []
7373
for (const filename of filenames) {
7474
const params = { filename, supported_feature }
75-
const promise = new Promise((resolve, reject) => {
76-
api_fetch(
77-
{ schema, params },
78-
{
79-
request_error_function: () => {
80-
reject()
81-
},
82-
response_function: (response) => {
83-
resolve(response._data.allowed_objects)
84-
},
85-
response_error_function: () => {
86-
reject()
87-
},
88-
},
89-
)
90-
})
75+
const promise = api_fetch({ schema, params })
9176
promise_array.push(promise)
9277
}
93-
const values = await Promise.all(promise_array)
78+
const responses = await Promise.all(promise_array)
79+
let values = []
80+
for (const response of responses) {
81+
values.push(response.data.value.allowed_objects)
82+
}
9483
const all_keys = [...new Set(values.flatMap((value) => Object.keys(value)))]
9584
const common_keys = all_keys.filter(
9685
(i) => !values.some((j) => !Object.keys(j).includes(i)),
@@ -119,7 +108,6 @@
119108
emit("increment_step")
120109
}
121110
}
122-
123111
await get_allowed_objects()
124112
</script>
125113

‎components/PackagesVersions.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</template>
2020

2121
<script setup>
22-
import Status from "@/utils/status.js"
22+
import Status from "@ogw_f/utils/status.js"
2323
2424
const props = defineProps({
2525
schema: { type: Object, required: true },

‎components/Recaptcha.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
onMounted(() => {
2323
if (process.client) {
2424
const config = useRuntimeConfig()
25-
if (config.public.NODE_ENV !== "production") {
25+
if (config.public.NODE_ENV !== "production" || !infra_store.is_cloud) {
2626
infra_store.$patch({ is_captcha_validated: true })
2727
}
2828
}

‎components/RemoteRenderingView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import vtkRemoteView from "@kitware/vtk.js/Rendering/Misc/RemoteView"
2525
import { useElementSize, useWindowSize } from "@vueuse/core"
2626
import viewer_schemas from "@geode/opengeodeweb-viewer/schemas.json"
27-
import Status from "@/utils/status.js"
27+
import Status from "@ogw_f/utils/status.js"
2828
2929
const props = defineProps({
3030
viewId: { type: String, default: "-1" },

0 commit comments

Comments
 (0)