@signal24/vue-foundation 4.4.0 → 4.5.1

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@signal24/vue-foundation",
     "type": "module",
-    "version": "4.4.0",
+    "version": "4.5.1",
     "description": "Common components, directives, and helpers for Vue 3 apps",
     "module": "./dist/vue-foundation.es.js",
     "bin": {

package/src/helpers/context-menu.ts

@@ -53,7 +53,7 @@ export function showContextMenu(e: MouseEvent, config: ContextMenuConfig) {
         }
 
         if (item.shouldConfirm) {
-            itemEl.addEventListener('click', () => confirmAction(itemEl, item.handler));
+            itemEl.addEventListener('click', e => confirmAction(e, itemEl, item.handler));
         } else {
             itemEl.addEventListener('click', () => item.handler());
         }
@@ -85,7 +85,7 @@ export function showContextMenu(e: MouseEvent, config: ContextMenuConfig) {
         wrapperEl.remove();
     }
 
-    function confirmAction(itemEl: HTMLElement, handler: () => void) {
+    function confirmAction(e: MouseEvent, itemEl: HTMLElement, handler: () => void) {
         if (itemEl.classList.contains('pending-confirm')) {
             return handler();
         }
@@ -106,4 +106,3 @@ export function showContextMenu(e: MouseEvent, config: ContextMenuConfig) {
 }
 
 // TODO: actually de-select text rather than just using CSS to hide its selection
-// TODO: confirm isn't working

package/src/helpers/openapi.ts

@@ -53,6 +53,8 @@ export function isApiError(err: any): err is IApiError {
 export function installApiClientInterceptors({ apiClient, onRequest, onError, CancelablePromise }: IWrappedApiClientOptions) {
     const originalRequest = apiClient.request.request.bind(apiClient.request);
     apiClient.request.request = (options: IRequestOptions) => {
+        options = rewriteOptionsForFileUpload(options);
+
         if (onRequest) {
             options = onRequest(options);
         }
@@ -82,3 +84,39 @@ export function installApiClientInterceptors({ apiClient, onRequest, onError, Ca
         });
     };
 }
+
+export class FileUploadRequest {
+    constructor(blob: Blob) {
+        this.blob = blob;
+    }
+
+    validator = null;
+    lastModifiedDate = null;
+    size = 0;
+    path = '';
+    name = '';
+    type = '';
+    blob!: Blob;
+}
+
+function rewriteOptionsForFileUpload(options: IRequestOptions): IRequestOptions {
+    const hasFileUpload = typeof options.body === 'object' && Object.values(options.body).some(v => v instanceof FileUploadRequest);
+    if (!hasFileUpload) return options;
+
+    const formData: Record<string, any> = {};
+    const jsonBody: Record<string, any> = {};
+    for (const [key, value] of Object.entries(options.body)) {
+        if (value instanceof FileUploadRequest) {
+            formData[key] = value.blob;
+        } else {
+            jsonBody[key] = value;
+        }
+    }
+    formData._payload = new Blob([JSON.stringify(jsonBody)], { type: 'application/json' });
+
+    return {
+        ...options,
+        body: undefined,
+        formData
+    };
+}