@panneau/field-upload 3.0.6 → 3.0.9

package/es/index.js

@@ -1,6 +1,7 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
+import { useLocation } from '@folklore/routes';
 import { faTimes, faFileVideo, faFileImage, faFileAudio } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Dashboard, DashboardModal } from '@uppy/react';
@@ -106,12 +107,24 @@ var UploadField = function UploadField(_ref) {
     disabled = _ref.disabled,
     onChange = _ref.onChange,
     className = _ref.className;
+  var _useLocation = useLocation(),
+    _useLocation2 = _slicedToArray(_useLocation, 1),
+    _useLocation2$0$pathn = _useLocation2[0].pathname,
+    pathname = _useLocation2$0$pathn === void 0 ? null : _useLocation2$0$pathn;
   // const { ref: containerRef, entry = null } = useResizeObserver();
   // const { contentRect } = entry || {};
   // const { width: containerWidth = null } = contentRect || {};
 
+  var mergeData = useCallback(function (newValue) {
+    // Merge the response from our back-end
+    if (isObject(newValue) && isObject(newValue.response) && newValue.response.status === 200 && newValue.response.body !== null) {
+      return _objectSpread(_objectSpread({}, newValue), newValue.response.body || null);
+    }
+    return newValue;
+  }, []);
   var onComplete = useCallback(function (response) {
     console.log('upload complete', response); // eslint-disable-line
+
     var newValue = null;
     if (isArray(response)) {
       if (allowMultipleUploads) {
@@ -124,17 +137,19 @@ var UploadField = function UploadField(_ref) {
     } else if (response && response.successful) {
       newValue = response.successful.length > 0 ? response.successful[0].response.body : null;
     }
-
-    // Merge the response from our back-end
-    if (isObject(newValue) && isObject(newValue.response) && newValue.response.status === 200 && newValue.response.body !== null) {
-      newValue = _objectSpread(_objectSpread({}, newValue), newValue.response.body || null);
+    if (isArray(newValue)) {
+      newValue = newValue.map(function (val) {
+        return mergeData(val);
+      });
+    } else {
+      newValue = mergeData(newValue);
     }
     console.log('new upload value', newValue); // eslint-disable-line
 
     if (onChange !== null) {
       onChange(newValue);
     }
-  }, [onChange, allowMultipleUploads]);
+  }, [onChange, allowMultipleUploads, mergeData]);
   var typesString = types.join('.');
   var allowedFileTypes = useMemo(function () {
     if (fileTypes !== null) {
@@ -349,6 +364,7 @@ var UploadField = function UploadField(_ref) {
     onPageChange: onListPageChange,
     onQueryChange: onListQueryChange,
     onQueryReset: onListQueryReset,
+    baseUrl: pathname,
     listProps: {
       actions: ['select'],
       actionsProps: {

package/lib/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
+var routes = require('@folklore/routes');
 var freeSolidSvgIcons = require('@fortawesome/free-solid-svg-icons');
 var reactFontawesome = require('@fortawesome/react-fontawesome');
 var react = require('@uppy/react');
@@ -127,12 +128,24 @@ var UploadField = function UploadField(_ref) {
     disabled = _ref.disabled,
     onChange = _ref.onChange,
     className = _ref.className;
+  var _useLocation = routes.useLocation(),
+    _useLocation2 = _slicedToArray__default["default"](_useLocation, 1),
+    _useLocation2$0$pathn = _useLocation2[0].pathname,
+    pathname = _useLocation2$0$pathn === void 0 ? null : _useLocation2$0$pathn;
   // const { ref: containerRef, entry = null } = useResizeObserver();
   // const { contentRect } = entry || {};
   // const { width: containerWidth = null } = contentRect || {};
 
+  var mergeData = React.useCallback(function (newValue) {
+    // Merge the response from our back-end
+    if (isObject__default["default"](newValue) && isObject__default["default"](newValue.response) && newValue.response.status === 200 && newValue.response.body !== null) {
+      return _objectSpread__default["default"](_objectSpread__default["default"]({}, newValue), newValue.response.body || null);
+    }
+    return newValue;
+  }, []);
   var onComplete = React.useCallback(function (response) {
     console.log('upload complete', response); // eslint-disable-line
+
     var newValue = null;
     if (isArray__default["default"](response)) {
       if (allowMultipleUploads) {
@@ -145,17 +158,19 @@ var UploadField = function UploadField(_ref) {
     } else if (response && response.successful) {
       newValue = response.successful.length > 0 ? response.successful[0].response.body : null;
     }
-
-    // Merge the response from our back-end
-    if (isObject__default["default"](newValue) && isObject__default["default"](newValue.response) && newValue.response.status === 200 && newValue.response.body !== null) {
-      newValue = _objectSpread__default["default"](_objectSpread__default["default"]({}, newValue), newValue.response.body || null);
+    if (isArray__default["default"](newValue)) {
+      newValue = newValue.map(function (val) {
+        return mergeData(val);
+      });
+    } else {
+      newValue = mergeData(newValue);
     }
     console.log('new upload value', newValue); // eslint-disable-line
 
     if (onChange !== null) {
       onChange(newValue);
     }
-  }, [onChange, allowMultipleUploads]);
+  }, [onChange, allowMultipleUploads, mergeData]);
   var typesString = types.join('.');
   var allowedFileTypes = React.useMemo(function () {
     if (fileTypes !== null) {
@@ -370,6 +385,7 @@ var UploadField = function UploadField(_ref) {
     onPageChange: onListPageChange,
     onQueryChange: onListQueryChange,
     onQueryReset: onListQueryReset,
+    baseUrl: pathname,
     listProps: {
       actions: ['select'],
       actionsProps: {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/field-upload",
-    "version": "3.0.6",
+    "version": "3.0.9",
     "description": "An Upload field",
     "keywords": [
         "javascript"
@@ -53,16 +53,17 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.12.5",
+        "@folklore/routes": "^0.2.10",
         "@fortawesome/fontawesome-svg-core": "^1.2.35",
         "@fortawesome/free-solid-svg-icons": "^5.15.3",
         "@fortawesome/react-fontawesome": "^0.1.14",
-        "@panneau/core": "^3.0.6",
-        "@panneau/element-button": "^3.0.6",
-        "@panneau/element-card": "^3.0.6",
-        "@panneau/element-label": "^3.0.6",
-        "@panneau/list-resource-items": "^3.0.6",
-        "@panneau/modal-dialog": "^3.0.6",
-        "@panneau/themes": "^3.0.6",
+        "@panneau/core": "^3.0.9",
+        "@panneau/element-button": "^3.0.9",
+        "@panneau/element-card": "^3.0.9",
+        "@panneau/element-label": "^3.0.9",
+        "@panneau/list-resource-items": "^3.0.9",
+        "@panneau/modal-dialog": "^3.0.9",
+        "@panneau/themes": "^3.0.9",
         "@uppy/core": "^3.2.0",
         "@uppy/dashboard": "^3.4.0",
         "@uppy/drag-drop": "^3.0.2",
@@ -80,5 +81,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "d63085d290a7391e19b77726d08c02deaa2f6ef1"
+    "gitHead": "5725a31a8f873f1ae84c6df3ac712baf75be15b5"
 }