Skip to content

Commit 0fd79da

Browse files
authored
Merge pull request #80 from Geode-solutions/feat_schemas_import
Feat_schemas_import
2 parents 7ae3ebb + ebb38b5 commit 0fd79da

22 files changed

+2155
-4716
lines changed

assets/schemas/CrsSelector.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

assets/schemas/ExtensionSelector.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

assets/schemas/FileSelector.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

assets/schemas/MissingFilesSelector.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

assets/schemas/ObjectSelector.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

components/CrsSelector.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
</template>
2525

2626
<script setup>
27-
import schema from "@/assets/schemas/CrsSelector.json"
27+
import schemas from "@geode/opengeodeweb-back/schemas.json"
28+
const schema = schemas.opengeodeweb_back.geographic_coordinate_systems
29+
2830
const emit = defineEmits([
2931
"update_values",
3032
"increment_step",
@@ -64,11 +66,13 @@
6466
async function get_crs_table() {
6567
const params = { input_geode_object }
6668
toggle_loading()
69+
console.log("get_crs_table")
6770
await api_fetch(
6871
{ schema, params },
6972
{
7073
response_function: (response) => {
7174
crs_list.value = response._data.crs_list
75+
console.log("crs_list", response._data.crs_list)
7276
},
7377
},
7478
)

components/ExtensionSelector.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
</template>
6060

6161
<script setup>
62-
import schema from "@/assets/schemas/ExtensionSelector.json"
63-
62+
import schemas from "@geode/opengeodeweb-back/schemas.json"
63+
const schema = schemas.opengeodeweb_back.geode_objects_and_output_extensions
6464
const emit = defineEmits([
6565
"update_values",
6666
"increment_step",

components/FileSelector.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
<FetchingData v-if="loading" />
33
<FileUploader
44
v-else
5-
v-bind="{ multiple, accept, route }"
5+
v-bind="{ multiple, accept }"
66
@files_uploaded="files_uploaded_event"
77
/>
88
</template>
99

1010
<script setup>
11-
import schema from "@/assets/schemas/FileSelector.json"
11+
import schemas from "@geode/opengeodeweb-back/schemas.json"
1212
13+
const schema = schemas.opengeodeweb_back.allowed_files
1314
const emit = defineEmits([
1415
"update_values",
1516
"increment_step",
@@ -19,10 +20,9 @@
1920
const props = defineProps({
2021
multiple: { type: Boolean, required: true },
2122
key: { type: String, required: false, default: "" },
22-
route: { type: String, required: false, default: "" },
2323
})
2424
25-
const { multiple, key, route } = props
25+
const { multiple, key } = props
2626
2727
const accept = ref("")
2828
const loading = ref(false)

components/FileUploader.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,16 @@
3030
</template>
3131

3232
<script setup>
33+
import schemas from "@geode/opengeodeweb-back/schemas.json"
34+
const schema = schemas.opengeodeweb_back.upload_file
35+
3336
const emit = defineEmits(["files_uploaded", "decrement_step"])
3437
3538
const props = defineProps({
3639
multiple: { type: Boolean, required: true },
3740
accept: { type: String, required: true },
38-
route: { type: String, required: true },
3941
})
40-
const { multiple, accept, route } = toRefs(props)
42+
const { multiple, accept } = toRefs(props)
4143
4244
const label = multiple ? "Please select file(s)" : "Please select a file"
4345
const files = ref([])
@@ -52,7 +54,7 @@
5254
for (const file of files.value) {
5355
const promise = new Promise((resolve, reject) => {
5456
upload_file(
55-
{ route, file },
57+
{ route: schema.$id, file },
5658
{
5759
request_error_function: () => {
5860
reject()

components/MissingFilesSelector.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<v-row>
2727
<v-col cols="12">
2828
<FileUploader
29-
v-bind="{ multiple, accept, route }"
29+
v-bind="{ multiple, accept }"
3030
@files_uploaded="files_uploaded_event"
3131
/>
3232
</v-col>
@@ -43,7 +43,9 @@
4343
</template>
4444

4545
<script setup>
46-
import schema from "@/assets/schemas/MissingFilesSelector.json"
46+
import schemas from "@geode/opengeodeweb-back/schemas.json"
47+
48+
const schema = schemas.opengeodeweb_back.missing_files
4749
4850
const emit = defineEmits([
4951
"update_values",
@@ -55,10 +57,9 @@
5557
multiple: { type: Boolean, required: true },
5658
input_geode_object: { type: String, required: true },
5759
filenames: { type: Array, required: true },
58-
route: { type: String, required: true },
5960
})
6061
61-
const { multiple, input_geode_object, filenames, route } = props
62+
const { multiple, input_geode_object, filenames } = props
6263
6364
const accept = ref("")
6465
const loading = ref(false)
@@ -68,6 +69,7 @@
6869
const toggle_loading = useToggle(loading)
6970
7071
function files_uploaded_event(value) {
72+
console.log("update_values")
7173
emit("update_values", { additional_files: value })
7274
missing_files()
7375
}

0 commit comments

Comments
 (0)