From 650e9d6b07274765724222d0f6ef0593ac12b1ef Mon Sep 17 00:00:00 2001 From: MaxNumerique Date: Tue, 27 Jan 2026 10:03:50 +0100 Subject: [PATCH 01/30] geode_objects --- .oxlintrc.json | 4 +++- app/assets/geode_objects.js | 4 +--- app/components/ObjectSelector.vue | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.oxlintrc.json b/.oxlintrc.json index a033f40f..d42353bb 100644 --- a/.oxlintrc.json +++ b/.oxlintrc.json @@ -22,7 +22,9 @@ } ], "eslint/sort-keys": "off", - "eslint/no-ternary": "off" + "eslint/no-ternary": "off", + "import/no-named-export": "off", + "import/prefer-default-export": "off" }, "overrides": [ { diff --git a/app/assets/geode_objects.js b/app/assets/geode_objects.js index 60eed2e6..899bf6e9 100644 --- a/app/assets/geode_objects.js +++ b/app/assets/geode_objects.js @@ -24,7 +24,7 @@ import TriangulatedSurface2D from "@ogw_front/assets/img/geode_objects/Triangula import TriangulatedSurface3D from "@ogw_front/assets/img/geode_objects/TriangulatedSurface3D.svg" import VertexSet from "@ogw_front/assets/img/geode_objects/VertexSet.svg" -const geode_objects = { +export const geode_objects = { BRep: { tooltip: "BRep", image: BRep, @@ -126,5 +126,3 @@ const geode_objects = { image: VertexSet, }, } - -export default geode_objects diff --git a/app/components/ObjectSelector.vue b/app/components/ObjectSelector.vue index 27c020f6..658df4f5 100644 --- a/app/components/ObjectSelector.vue +++ b/app/components/ObjectSelector.vue @@ -49,10 +49,9 @@ diff --git a/app/components/ExtensionSelector.vue b/app/components/ExtensionSelector.vue index d5dd322a..4fdbc3e9 100644 --- a/app/components/ExtensionSelector.vue +++ b/app/components/ExtensionSelector.vue @@ -11,11 +11,10 @@ "decrement_step", ]) - const props = defineProps({ + const { geode_object_type, filenames } = defineProps({ geode_object_type: { type: String, required: true }, filenames: { type: Array, required: true }, }) - const { geode_object_type, filenames } = props const geode_objects_and_output_extensions = ref({}) const loading = ref(false) @@ -25,27 +24,20 @@ toggle_loading() geode_objects_and_output_extensions.value = {} const geodeStore = useGeodeStore() - const promise_array = filenames.map((filename) => { - return new Promise((resolve, reject) => { - const params = { + const values = await Promise.all( + filenames.map(async (filename) => { + const response = await geodeStore.request(schema, { geode_object_type, filename, - } - geodeStore.request(schema, params, { - request_error_function: () => reject(), - response_function: (response) => { - resolve(response.geode_objects_and_output_extensions) - }, - response_error_function: () => reject(), }) - }) - }) - const values = await Promise.all(promise_array) + return response.geode_objects_and_output_extensions + }), + ) const all_keys = [...new Set(values.flatMap((value) => Object.keys(value)))] const common_keys = all_keys.filter( (i) => !values.some((j) => !Object.keys(j).includes(i)), ) - var final_object = {} + const final_object = {} for (const key of common_keys) { final_object[key] = {} for (const value of values) { @@ -61,7 +53,7 @@ } function update_values(output_geode_object, output_extension) { - if (output_geode_object != "" && output_extension != "") { + if (output_geode_object !== "" && output_extension !== "") { emit("update_values", { output_geode_object, output_extension, diff --git a/app/components/FeedBack/Snackers.vue b/app/components/FeedBack/Snackers.vue index 4c0bd746..69404c3e 100644 --- a/app/components/FeedBack/Snackers.vue +++ b/app/components/FeedBack/Snackers.vue @@ -1,11 +1,15 @@ diff --git a/app/components/FileSelector.vue b/app/components/FileSelector.vue index d943357e..5ca9187e 100644 --- a/app/components/FileSelector.vue +++ b/app/components/FileSelector.vue @@ -13,31 +13,35 @@ "decrement_step", ]) - const props = defineProps({ + const { multiple, files, auto_upload } = defineProps({ multiple: { type: Boolean, required: true }, files: { type: Array, default: () => [] }, auto_upload: { type: Boolean, default: true }, }) - const internal_files = ref(props.files) - const auto_upload = ref(props.auto_upload) + const internal_files = ref(files) + const internal_auto_upload = ref(auto_upload) const accept = ref("") const loading = ref(false) watch( - () => props.files, - (val) => (internal_files.value = val), + () => files, + (val) => { + internal_files.value = val + }, ) watch( - () => props.auto_upload, - (val) => (auto_upload.value = val), + () => auto_upload, + (val) => { + internal_auto_upload.value = val + }, ) const toggle_loading = useToggle(loading) function files_uploaded_event(value) { - if (value.length) { + if (value.length > 0) { emit("update_values", { files: value, auto_upload: false }) emit("increment_step") } @@ -47,7 +51,7 @@ toggle_loading() const geodeStore = useGeodeStore() const response = await geodeStore.request(schema, {}) - accept.value = response.extensions.map((e) => `.${e}`).join(",") + accept.value = response.extensions.map((extension) => `.${extension}`).join(",") toggle_loading() } @@ -58,7 +62,7 @@ diff --git a/app/components/FileUploader.vue b/app/components/FileUploader.vue index a346cb35..86ab445f 100644 --- a/app/components/FileUploader.vue +++ b/app/components/FileUploader.vue @@ -1,13 +1,13 @@ @@ -95,8 +97,8 @@ diff --git a/app/components/RemoteRenderingView.vue b/app/components/RemoteRenderingView.vue index 54d1801a..e0beaecf 100644 --- a/app/components/RemoteRenderingView.vue +++ b/app/components/RemoteRenderingView.vue @@ -1,12 +1,12 @@