@geode/opengeodeweb-front 6.0.0-rc.2 → 6.0.0-rc.4

package/assets/schemas/ExtensionSelector.json

@@ -5,8 +5,11 @@
   "properties": {
     "input_geode_object": {
       "type": "string"
+    },
+    "filename": {
+      "type": "string"
     }
   },
-  "required": ["input_geode_object"],
+  "required": ["input_geode_object", "filename"],
   "additionalProperties": false
 }

package/components/Errors/Banner.vue

@@ -43,7 +43,6 @@
 </template>
 
 <script setup>
-  import { use_errors_store } from "@/stores/errors"
   const errors_store = use_errors_store()
   const { server_error } = storeToRefs(errors_store)
 

package/components/Errors/Snackers.vue

@@ -55,7 +55,6 @@
 </template>
 
 <script setup>
-  import { use_errors_store } from "@/stores/errors"
   const errors_store = use_errors_store()
   const { errors } = storeToRefs(errors_store)
 

package/components/ExtensionSelector.vue

@@ -1,28 +1,30 @@
 <template>
   <FetchingData v-if="loading" />
   <v-row
-    v-for="item in geode_objects_and_output_extensions"
-    :key="item.geode_object"
+    v-for="(
+      output_extensions, output_geode_object
+    ) in geode_objects_and_output_extensions"
+    :key="output_geode_object"
     class="justify-left"
   >
     <v-card class="card ma-2 pa-2" width="100%">
-      <v-tooltip :text="`Export as a ${item.geode_object}`" location="bottom">
+      <v-tooltip :text="`Export as a ${output_geode_object}`" location="bottom">
         <template v-slot:activator="{ props }">
           <v-card-title v-bind="props">
-            {{ item.geode_object }}
+            {{ output_geode_object }}
           </v-card-title>
         </template>
       </v-tooltip>
       <v-card-text>
         <v-row>
           <v-col
-            v-for="output in item.outputs"
-            :key="output.extension"
+            v-for="(extension, output_extension) in output_extensions"
+            :key="output_extension"
             cols="auto"
             class="pa-0"
           >
             <v-tooltip
-              :disabled="output.is_saveable"
+              :disabled="extension.is_saveable"
               text="Data not saveable with this file extension"
               location="bottom"
             >
@@ -30,13 +32,15 @@
                 <span v-bind="props">
                   <v-card
                     class="card ma-2"
-                    :color="output.is_saveable ? 'primary' : 'grey'"
+                    :color="extension.is_saveable ? 'primary' : 'grey'"
                     hover
-                    @click="set_variables(item.geode_object, output.extension)"
-                    :disabled="!output.is_saveable"
+                    @click="
+                      set_variables(output_geode_object, output_extension)
+                    "
+                    :disabled="!extension.is_saveable"
                   >
                     <v-card-title align="center">
-                      {{ output.extension }}
+                      {{ output_extension }}
                     </v-card-title>
                   </v-card>
                 </span>
@@ -50,6 +54,7 @@
 </template>
 
 <script setup>
+  import _ from "lodash"
   import schema from "@/assets/schemas/ExtensionSelector.json"
 
   const emit = defineEmits([
@@ -60,33 +65,65 @@
 
   const props = defineProps({
     input_geode_object: { type: String, required: true },
+    filenames: { type: Array, required: true },
   })
-  const { input_geode_object } = props
-
-  const geode_objects_and_output_extensions = ref([])
+  const { input_geode_object, filenames } = props
+  const geode_objects_and_output_extensions = ref({})
   const loading = ref(false)
 
   const toggle_loading = useToggle(loading)
 
   async function get_output_file_extensions() {
     toggle_loading()
-    const params = { input_geode_object }
-    await api_fetch(
-      { schema, params },
-      {
-        response_function: (response) => {
-          geode_objects_and_output_extensions.value =
-            response._data.geode_objects_and_output_extensions
-        },
-      },
-    )
+    geode_objects_and_output_extensions.vaue = {}
+    var promise_array = []
+    for (const filename of filenames) {
+      const params = { input_geode_object, filename }
+      const promise = new Promise((resolve, reject) => {
+        api_fetch(
+          { schema, params },
+          {
+            request_error_function: () => {
+              reject()
+            },
+            response_function: (response) => {
+              const data = response._data.geode_objects_and_output_extensions
+              if (_.isEmpty(geode_objects_and_output_extensions.value)) {
+                geode_objects_and_output_extensions.value = data
+              } else {
+                for (const [geode_object, geode_object_value] of Object.entries(
+                  data,
+                )) {
+                  for (const [
+                    output_extension,
+                    output_extension_value,
+                  ] of Object.entries(geode_object_value)) {
+                    if (!output_extension_value["is_saveable"]) {
+                      geode_objects_and_output_extensions.value[geode_object][
+                        output_extension
+                      ]["is_saveable"] = false
+                    }
+                  }
+                }
+              }
+              resolve()
+            },
+            response_error_function: () => {
+              reject()
+            },
+          },
+        )
+      })
+      promise_array.push(promise)
+    }
+    await Promise.all(promise_array)
     toggle_loading()
   }
 
-  function set_variables(geode_object, output_extension) {
-    if (geode_object != "" && output_extension != "") {
+  function set_variables(output_geode_object, output_extension) {
+    if (output_geode_object != "" && output_extension != "") {
       const keys_values_object = {
-        output_geode_object: geode_object,
+        output_geode_object,
         output_extension,
       }
       emit("update_values", keys_values_object)

package/components/FileUploader.vue

@@ -49,15 +49,29 @@
 
   async function upload_files() {
     toggle_loading()
-    await upload_file(
-      { route, files: multiple ? files.value : [files.value[0]] },
-      {
-        response_function: () => {
-          files_uploaded.value = true
-          emit("files_uploaded", files.value)
-        },
-      },
-    )
+    var promise_array = []
+    for (const file of files.value) {
+      const promise = new Promise((resolve, reject) => {
+        upload_file(
+          { route, file },
+          {
+            request_error_function: () => {
+              reject()
+            },
+            response_function: () => {
+              resolve()
+            },
+            response_error_function: () => {
+              reject()
+            },
+          },
+        )
+      })
+      promise_array.push(promise)
+    }
+    await Promise.all(promise_array)
+    files_uploaded.value = true
+    emit("files_uploaded", files.value)
     toggle_loading()
   }
 

package/components/Launcher.vue

@@ -18,9 +18,6 @@
 </template>
 
 <script setup>
-  import { use_websocket_store } from "@/stores/websocket"
-  import { use_cloud_store } from "@/stores/cloud"
-
   const websocket_store = use_websocket_store()
   const cloud_store = use_cloud_store()
   const { is_captcha_validated, is_connexion_launched, is_running } =

package/components/MissingFilesSelector.vue

@@ -54,11 +54,11 @@
   const props = defineProps({
     multiple: { type: Boolean, required: true },
     input_geode_object: { type: String, required: true },
-    files: { type: Array, required: true },
+    filenames: { type: Array, required: true },
     route: { type: String, required: true },
   })
 
-  const { multiple, input_geode_object, files, route } = props
+  const { multiple, input_geode_object, filenames, route } = props
 
   const accept = ref("")
   const loading = ref(false)
@@ -73,39 +73,51 @@
   }
 
   async function missing_files() {
+    toggle_loading()
     has_missing_files.value = false
     mandatory_files.value = []
     additional_files.value = []
-    toggle_loading()
-    for (const file of files) {
-      const params = { input_geode_object, filename: file.name }
-      await api_fetch(
-        { schema, params },
-        {
-          response_function: (response) => {
-            has_missing_files.value = response._data.has_missing_files
-            mandatory_files.value = [].concat(
-              mandatory_files.value,
-              response._data.mandatory_files,
-            )
-            additional_files.value = [].concat(
-              additional_files.value,
-              response._data.additional_files,
-            )
-            const files_list = [].concat(
-              mandatory_files.value,
-              additional_files.value,
-            )
-            accept.value = files_list
-              .map((filename) => "." + filename.split(".").pop())
-              .join(",")
-            if (!has_missing_files.value) {
-              console.log("MISSING FILESSELECTOR increment_step")
-              emit("increment_step")
-            }
+    var promise_array = []
+
+    for (const filename of filenames) {
+      const params = { input_geode_object, filename }
+      const promise = new Promise((resolve, reject) => {
+        api_fetch(
+          { schema, params },
+          {
+            request_error_function: () => {
+              reject()
+            },
+            response_function: (response) => {
+              has_missing_files.value = response._data.has_missing_files
+                ? true
+                : has_missing_files.value
+              mandatory_files.value = [].concat(
+                mandatory_files.value,
+                response._data.mandatory_files,
+              )
+              additional_files.value = [].concat(
+                additional_files.value,
+                response._data.additional_files,
+              )
+              resolve()
+            },
+            response_error_function: () => {
+              reject()
+            },
           },
-        },
-      )
+        )
+      })
+      promise_array.push(promise)
+    }
+    await Promise.all(promise_array)
+    if (!has_missing_files.value) {
+      emit("increment_step")
+    } else {
+      accept.value = []
+        .concat(mandatory_files.value, additional_files.value)
+        .map((filename) => "." + filename.split(".").pop())
+        .join(",")
     }
     toggle_loading()
   }

package/components/ObjectSelector.vue

@@ -31,17 +31,18 @@
 </template>
 
 <script setup>
+  import { toRaw } from "vue"
   import geode_objects from "@/assets/geode_objects"
   import schema from "@/assets/schemas/ObjectSelector.json"
 
   const emit = defineEmits(["update_values", "increment_step"])
 
   const props = defineProps({
-    files: { type: Array, required: true },
+    filenames: { type: Array, required: true },
     key: { type: String, required: false, default: null },
   })
 
-  const { files, key } = props
+  const { filenames, key } = props
 
   const loading = ref(false)
   const allowed_objects = ref([])
@@ -49,22 +50,43 @@
   const toggle_loading = useToggle(loading)
 
   async function get_allowed_objects() {
-    const params = { filename: files[0].name, key }
     toggle_loading()
-    await api_fetch(
-      { schema, params },
-      {
-        response_function: (response) => {
-          allowed_objects.value = response._data.allowed_objects
-        },
-      },
-    )
+    allowed_objects.value = []
+    var promise_array = []
+    for (const filename of filenames) {
+      const params = { filename, key }
+      const promise = new Promise((resolve, reject) => {
+        api_fetch(
+          { schema, params },
+          {
+            request_error_function: () => {
+              reject()
+            },
+            response_function: (response) => {
+              if (allowed_objects.value.length == 0) {
+                allowed_objects.value = response._data.allowed_objects
+              } else {
+                allowed_objects.value = toRaw(allowed_objects.value).filter(
+                  (value) => response._data.allowed_objects.includes(value),
+                )
+              }
+              resolve()
+            },
+            response_error_function: () => {
+              reject()
+            },
+          },
+        )
+      })
+      promise_array.push(promise)
+    }
+    await Promise.all(promise_array)
     toggle_loading()
   }
 
-  function set_geode_object(geode_object) {
-    if (geode_object != "") {
-      emit("update_values", { input_geode_object: geode_object })
+  function set_geode_object(input_geode_object) {
+    if (input_geode_object != "") {
+      emit("update_values", { input_geode_object })
       emit("increment_step")
     }
   }

package/components/PackagesVersions.vue

@@ -19,7 +19,6 @@
 </template>
 
 <script setup>
-  import { use_cloud_store } from "@/stores/cloud"
   const cloud_store = use_cloud_store()
   const { is_running } = storeToRefs(cloud_store)
 

package/components/Recaptcha.vue

@@ -13,7 +13,6 @@
 
 <script setup>
   import { VueRecaptcha } from "vue-recaptcha"
-  import { use_cloud_store } from "@/stores/cloud"
   const cloud_store = use_cloud_store()
   const { is_captcha_validated } = storeToRefs(cloud_store)
 

package/components/RemoteRenderingView.vue

@@ -23,8 +23,6 @@
 <script setup>
   import vtkRemoteView from "@kitware/vtk.js/Rendering/Misc/RemoteView"
   import { useElementSize } from "@vueuse/core"
-  import { use_viewer_store } from "@/stores/viewer"
-  import { use_websocket_store } from "@/stores/websocket"
 
   const viewer_store = use_viewer_store()
   const { picking_mode } = storeToRefs(viewer_store)

package/components/Step.vue

@@ -63,9 +63,7 @@
   }
 
   function update_values_event(keys_values_object) {
-    console.log("update_values_event", keys_values_object)
     for (const [key, value] of Object.entries(keys_values_object)) {
-      console.log(key, value)
       stepper_tree[key] = value
     }
   }

package/components/ViewToolbar.vue

@@ -19,8 +19,6 @@
 </template>
 
 <script setup>
-  import { use_viewer_store } from "@/stores/viewer"
-
   const viewer_store = use_viewer_store()
   function reset_camera() {
     viewer_store.reset_camera()

package/components/Wrapper.vue

@@ -18,8 +18,6 @@
 </template>
 
 <script setup>
-  import { use_cloud_store } from "@/stores/cloud"
-
   const cloud_store = use_cloud_store()
   const { is_running } = storeToRefs(cloud_store)
 

package/composables/api_fetch.js

@@ -1,9 +1,6 @@
 import Ajv from "ajv"
 import _ from "lodash"
 
-import { use_errors_store } from "@/stores/errors"
-import { use_geode_store } from "@/stores/geode"
-
 export function api_fetch(
   { schema, params },
   { request_error_function, response_function, response_error_function } = {},

package/composables/runFunctionIfCloudRunning.js

@@ -1,5 +1,3 @@
-import { use_cloud_store } from "@/stores/cloud"
-
 export default function (function_to_run) {
   const cloud_store = use_cloud_store()
   const { is_running } = storeToRefs(cloud_store)

package/composables/upload_file.js

@@ -1,17 +1,12 @@
-import { use_errors_store } from "@/stores/errors"
-import { use_geode_store } from "@/stores/geode"
-
 export function upload_file(
-  { route, files },
+  { route, file },
   { request_error_function, response_function, response_error_function } = {},
 ) {
   const errors_store = use_errors_store()
   const geode_store = use_geode_store()
 
   const body = new FormData()
-  for (let i = 0; i < files.length; i++) {
-    body.append("content", files[i])
-  }
+  body.append("file", file)
 
   const request_options = {
     method: "PUT",

package/package.json

@@ -4,37 +4,37 @@
     "lint": "eslint --fix --ext .js,.vue --ignore-path .gitignore ."
   },
   "devDependencies": {
-    "eslint": "^8.53.0",
+    "eslint": "^8.55.0",
     "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-nuxt": "^4.0.0",
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-prettier-vue": "^5.0.0",
-    "eslint-plugin-vue": "^9.18.1",
-    "eslint-plugin-vuetify": "^2.0.5",
-    "nuxt": "^3.8.1",
-    "prettier": "3.0.3"
+    "eslint-plugin-vue": "^9.19.2",
+    "eslint-plugin-vuetify": "^2.1.0",
+    "nuxt": "^3.8.2",
+    "prettier": "3.1.1"
   },
   "overrides": {
     "vue": "latest"
   },
   "description": "OpenSource Vue/Vuetify framework for web applications",
   "type": "module",
-  "version": "6.0.0-rc.2",
+  "version": "6.0.0-rc.4",
   "main": "./nuxt.config.js",
   "dependencies": {
-    "@kitware/vtk.js": "^29.1.1",
+    "@kitware/vtk.js": "^29.2.0",
     "@mdi/font": "^7.3.67",
     "@pinia/nuxt": "^0.5.1",
-    "@types/node": "^20.8.10",
-    "@vueuse/components": "^10.5.0",
-    "@vueuse/core": "^10.5.0",
+    "@types/node": "^20.10.4",
+    "@vueuse/components": "^10.7.0",
+    "@vueuse/core": "^10.7.0",
     "ajv": "^8.12.0",
     "lodash": "^4.17.21",
     "pinia": "^2.1.7",
     "sass": "^1.69.5",
     "semver": "^7.5.4",
     "vue-recaptcha": "^2.0.3",
-    "vuetify": "^3.3.23",
+    "vuetify": "^3.4.6",
     "wslink": "^1.12.4"
   },
   "repository": {

package/stores/cloud.js

@@ -1,7 +1,4 @@
 import { useStorage } from "@vueuse/core"
-import { use_errors_store } from "@/stores/errors"
-import { use_geode_store } from "@/stores/geode"
-import { use_websocket_store } from "@/stores/websocket"
 
 export const use_cloud_store = defineStore("cloud", {
   state: () => ({

package/stores/geode.js

@@ -1,6 +1,3 @@
-import { use_cloud_store } from "@/stores/cloud"
-import { use_errors_store } from "@/stores/errors"
-
 export const use_geode_store = defineStore("geode", {
   state: () => ({
     request_counter: 0,

package/stores/viewer.js

@@ -1,5 +1,3 @@
-import { use_websocket_store } from "@/stores/websocket"
-
 export const use_viewer_store = defineStore("viewer", {
   state: () => ({
     picking_mode: false,

package/stores/websocket.js

@@ -8,7 +8,6 @@ import SmartConnect from "wslink/src/SmartConnect"
 import "@kitware/vtk.js/Rendering/OpenGL/Profiles/Geometry"
 import { connectImageStream } from "@kitware/vtk.js/Rendering/Misc/RemoteView"
 import protocols from "@/utils"
-import { use_cloud_store } from "@/stores/cloud"
 
 // Bind vtkWSLinkClient to our SmartConnect
 vtkWSLinkClient.setSmartConnectClass(SmartConnect)