Skip to content

Commit b75c4b5

Browse files
fix(components): swith to array filenames
BREAKING CHANGE: Changes props
1 parent 7e4053a commit b75c4b5

File tree

4 files changed

+32
-38
lines changed

4 files changed

+32
-38
lines changed

components/ExtensionSelector.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@
5858
5959
const props = defineProps({
6060
input_geode_object: { type: String, required: true },
61+
filenames: { type: Array, required: true },
6162
schema: { type: Object, required: true },
6263
})
63-
const { input_geode_object, schema } = props
64+
const { input_geode_object, filenames, schema } = props
6465
6566
const geode_objects_and_output_extensions = ref([])
6667
const loading = ref(false)
@@ -69,7 +70,7 @@
6970
7071
async function get_output_file_extensions() {
7172
toggle_loading()
72-
const params = { input_geode_object }
73+
const params = { input_geode_object, filenames }
7374
await api_fetch(
7475
{ schema, params },
7576
{

components/MissingFilesSelector.vue

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
const props = defineProps({
5353
multiple: { type: Boolean, required: true },
5454
input_geode_object: { type: String, required: true },
55-
files: { type: Array, required: true },
55+
filenames: { type: Array, required: true },
5656
route: { type: String, required: true },
5757
schema: { type: Object, required: true },
5858
})
5959
60-
const { multiple, input_geode_object, files, route, schema } = props
60+
const { multiple, input_geode_object, filenames, route, schema } = props
6161
6262
const accept = ref("")
6363
const loading = ref(false)
@@ -76,36 +76,31 @@
7676
mandatory_files.value = []
7777
additional_files.value = []
7878
toggle_loading()
79-
for (const file of files) {
80-
const params = { input_geode_object, filename: file.name }
81-
await api_fetch(
82-
{ schema, params },
83-
{
84-
response_function: (response) => {
85-
has_missing_files.value = response._data.has_missing_files
86-
mandatory_files.value = [].concat(
87-
mandatory_files.value,
88-
response._data.mandatory_files,
89-
)
90-
additional_files.value = [].concat(
91-
additional_files.value,
92-
response._data.additional_files,
93-
)
94-
const files_list = [].concat(
95-
mandatory_files.value,
96-
additional_files.value,
97-
)
98-
accept.value = files_list
99-
.map((filename) => "." + filename.split(".").pop())
100-
.join(",")
101-
if (!has_missing_files.value) {
102-
console.log("MISSING FILESSELECTOR increment_step")
103-
emit("increment_step")
104-
}
105-
},
79+
const params = { input_geode_object, filenames }
80+
await api_fetch(
81+
{ schema, params },
82+
{
83+
response_function: (response) => {
84+
has_missing_files.value = response._data.has_missing_files
85+
mandatory_files.value = response._data.mandatory_files
86+
additional_files.value = response._data.additional_files
87+
88+
console.log("response", response)
89+
90+
const files_list = [].concat(
91+
mandatory_files.value,
92+
additional_files.value,
93+
)
94+
accept.value = files_list
95+
.map((filename) => "." + filename.split(".").pop())
96+
.join(",")
97+
if (!has_missing_files.value) {
98+
emit("increment_step")
99+
}
106100
},
107-
)
108-
}
101+
},
102+
)
103+
109104
toggle_loading()
110105
}
111106

components/ObjectSelector.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@
3636
const emit = defineEmits(["update_values", "increment_step"])
3737
3838
const props = defineProps({
39-
files: { type: Array, required: true },
39+
filenames: { type: Array, required: true },
4040
key: { type: String, required: false, default: null },
4141
schema: { type: Object, required: true },
4242
})
4343
44-
const { files, key, schema } = props
44+
const { filenames, key, schema } = props
4545
4646
const loading = ref(false)
4747
const allowed_objects = ref([])
4848
4949
const toggle_loading = useToggle(loading)
5050
5151
async function get_allowed_objects() {
52-
const params = { filename: files[0].name, key }
52+
const params = { filenames, key }
5353
toggle_loading()
5454
await api_fetch(
5555
{ schema, params },

components/Step.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@
6363
}
6464
6565
function update_values_event(keys_values_object) {
66-
console.log("update_values_event", keys_values_object)
6766
for (const [key, value] of Object.entries(keys_values_object)) {
68-
console.log(key, value)
6967
stepper_tree[key] = value
7068
}
7169
}

0 commit comments

Comments
 (0)