Skip to content

Commit 2f3b304

Browse files
pull from next
2 parents 2a28a7a + c5fea11 commit 2f3b304

File tree

10 files changed

+79
-10
lines changed

10 files changed

+79
-10
lines changed

assets/schemas/CrsSelector.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"$id": "/tools/geographic_coordinate_systems",
3+
"type": "object",
4+
"method": "POST",
5+
"properties": {
6+
"input_geode_object": {
7+
"type": "string"
8+
}
9+
},
10+
"required": ["input_geode_object"],
11+
"additionalProperties": false
12+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"$id": "/tools/geode_objects_and_output_extensions",
3+
"type": "object",
4+
"method": "POST",
5+
"properties": {
6+
"input_geode_object": {
7+
"type": "string"
8+
}
9+
},
10+
"required": ["input_geode_object"],
11+
"additionalProperties": false
12+
}

assets/schemas/FileSelector.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"$id": "/tools/allowed_files",
3+
"type": "object",
4+
"method": "POST",
5+
"properties": {
6+
"key": {
7+
"type": ["string", "null"]
8+
}
9+
},
10+
"required": ["key"],
11+
"additionalProperties": false
12+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"$id": "/tools/missing_files",
3+
"type": "object",
4+
"method": "POST",
5+
"properties": {
6+
"input_geode_object": {
7+
"type": "string"
8+
},
9+
"filename": {
10+
"type": "string"
11+
}
12+
},
13+
"required": ["input_geode_object", "filename"],
14+
"additionalProperties": false
15+
}

assets/schemas/ObjectSelector.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"$id": "/tools/allowed_objects",
3+
"type": "object",
4+
"method": "POST",
5+
"properties": {
6+
"filename": {
7+
"type": "string"
8+
},
9+
"key": {
10+
"type": ["string", "null"]
11+
}
12+
},
13+
"required": ["filename", "key"],
14+
"additionalProperties": false
15+
}

components/CrsSelector.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
</template>
2525

2626
<script setup>
27+
import schema from "@/assets/schemas/CrsSelector.json"
2728
const emit = defineEmits([
2829
"update_values",
2930
"increment_step",
@@ -33,10 +34,9 @@
3334
const props = defineProps({
3435
input_geode_object: { type: String, required: true },
3536
key_to_update: { type: String, required: true },
36-
schema: { type: Object, required: true },
3737
})
3838
39-
const { input_geode_object, key_to_update, schema } = props
39+
const { input_geode_object, key_to_update } = props
4040
4141
const search = ref("")
4242
const data_table_loading = ref(false)

components/ExtensionSelector.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151

5252
<script setup>
5353
import FetchingData from "@/components/FetchingData.vue"
54+
import schema from "@geode/opengeodeweb-front/assets/schemas/ExtensionSelector.json"
55+
5456
const emit = defineEmits([
5557
"update_values",
5658
"increment_step",
@@ -59,9 +61,8 @@
5961
6062
const props = defineProps({
6163
input_geode_object: { type: String, required: true },
62-
schema: { type: Object, required: true },
6364
})
64-
const { input_geode_object, schema } = props
65+
const { input_geode_object } = props
6566
6667
const geode_objects_and_output_extensions = ref([])
6768
const loading = ref(false)

components/FileSelector.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<script setup>
1111
import FetchingData from "@/components/FetchingData.vue"
1212
import FileUploader from "@/components/FileUploader.vue"
13+
import schema from "@geode/opengeodeweb-front/assets/schemas/FileSelector.json"
14+
1315
const emit = defineEmits([
1416
"update_values",
1517
"increment_step",
@@ -20,10 +22,9 @@
2022
multiple: { type: Boolean, required: true },
2123
key: { type: String, required: false, default: "" },
2224
route: { type: String, required: false, default: "" },
23-
schema: { type: Object, required: true },
2425
})
2526
26-
const { multiple, key, route, schema } = props
27+
const { multiple, key, route } = props
2728
2829
const accept = ref("")
2930
const loading = ref(false)

components/MissingFilesSelector.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
<script setup>
4646
import FetchingData from "@/components/FetchingData.vue"
4747
import FileUploader from "@/components/FileUploader.vue"
48+
import schema from "@geode/opengeodeweb-front/assets/schemas/MissingFilesSelector.json"
49+
4850
const emit = defineEmits([
4951
"update_values",
5052
"increment_step",
@@ -56,10 +58,9 @@
5658
input_geode_object: { type: String, required: true },
5759
files: { type: Array, required: true },
5860
route: { type: String, required: true },
59-
schema: { type: Object, required: true },
6061
})
6162
62-
const { multiple, input_geode_object, files, route, schema } = props
63+
const { multiple, input_geode_object, files, route } = props
6364
6465
const accept = ref("")
6566
const loading = ref(false)

components/ObjectSelector.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
<script setup>
3434
import FetchingData from "@/components/FetchingData.vue"
3535
import geode_objects from "@/assets/geode_objects"
36+
import schema from "@geode/opengeodeweb-front/assets/schemas/ObjectSelector.json"
3637
3738
const emit = defineEmits(["update_values", "increment_step"])
3839
3940
const props = defineProps({
4041
files: { type: Array, required: true },
4142
key: { type: String, required: false, default: null },
42-
schema: { type: Object, required: true },
4343
})
4444
45-
const { files, key, schema } = props
45+
const { files, key } = props
4646
4747
const loading = ref(false)
4848
const allowed_objects = ref([])

0 commit comments

Comments
 (0)