@geode/opengeodeweb-front 10.34.0-rc.17 → 10.34.0-rc.19

package/app/components/Viewer/ObjectTree/Base/ItemLabel.vue

@@ -31,6 +31,7 @@ interface LabeledItem {
   id: string;
   title?: string;
   is_active?: boolean;
+  category?: string;
   children?: unknown[];
 }
 
@@ -52,6 +53,9 @@ const tooltipTitle = computed<string>(() =>
 );
 
 const tooltipDisabled = computed<boolean>(() => {
+  if (actualItem.value.category !== undefined) {
+    return false;
+  }
   if (isLeaf !== undefined) {
     return !isLeaf;
   }

package/app/stores/back.ts

@@ -133,6 +133,7 @@ export const useBackStore = defineStore("back", {
         {
           schema,
           file,
+          raw: true,
         },
         {
           ...callbacks,

package/internal/utils/upload_file.ts

@@ -9,6 +9,10 @@ interface UploadFileParams {
   schema: JsonRpcSchema & { methods: string[] };
   file: File;
   params?: Record<string, string | Blob>;
+  // When true, the file is sent as the raw request body instead of multipart
+  // FormData, with `params`/filename moved into the query string. See
+  // OpenGeodeWeb-Back's upload_file route, which supports both request shapes.
+  raw?: boolean;
 }
 
 // Loosely-typed shapes for the dynamic error/response values reported by fetchRaw.
@@ -34,7 +38,7 @@ function isFetchErrorResponseLike(value: unknown): value is FetchErrorResponseLi
 
 async function upload_file(
   microservice: Microservice,
-  { schema, file, params = {} }: UploadFileParams,
+  { schema, file, params = {}, raw = false }: UploadFileParams,
   { request_error_function, response_function, response_error_function }: RequestHandlers = {},
 ): Promise<unknown> {
   console.log("[UPLOAD_FILE] Uploading file", { schema, file });
@@ -44,14 +48,25 @@ async function upload_file(
     throw new Error("file must be an instance of File");
   }
 
-  const body = new FormData();
-  for (const [key, value] of Object.entries(params)) {
-    body.append(key, value);
+  let route = schema.$id;
+  let body: FormData | File = file;
+
+  if (raw) {
+    const queryEntries = Object.entries(params).filter(
+      (entry): entry is [string, string] => typeof entry[1] === "string",
+    );
+    const query = new URLSearchParams([...queryEntries, ["filename", file.name]]);
+    route = `${route}?${query.toString()}`;
+  } else {
+    const formData = new FormData();
+    for (const [key, value] of Object.entries(params)) {
+      formData.append(key, value);
+    }
+    formData.append("file", file);
+    body = formData;
   }
-  body.append("file", file);
 
   microservice.start_request();
-  const route = schema.$id;
 
   const result = await fetchRaw(
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.34.0-rc.17",
+  "version": "10.34.0-rc.19",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {