@panneau/core 2.0.86 → 2.0.91

package/es/contexts.js

@@ -16,6 +16,7 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import { generatePath, useNavigate } from 'react-router';
 import { TrackingContext, TrackingContainer } from '@folklore/tracking';
 export { TrackingContext } from '@folklore/tracking';
+import slugify from 'slugify';
 import { v1 } from 'uuid';
 import EventEmitter from 'wolfy87-eventemitter';
 
@@ -1516,10 +1517,19 @@ var useUppy = function useUppy() {
     onFail = _ref$onFail === void 0 ? null : _ref$onFail,
     _ref$getFileName = _ref.getFileName,
     getFileName = _ref$getFileName === void 0 ? function (_ref2) {
-      var _ref2$extension = _ref2.extension,
+      var filename = _ref2.filename,
+        _ref2$extension = _ref2.extension,
         extension = _ref2$extension === void 0 ? null : _ref2$extension;
-      return "".concat(v1()).concat(extension !== null ? ".".concat(extension) : '');
+      return "".concat((slugify(filename) || '').substring(0, 50)).concat(extension !== null ? ".".concat(extension) : '');
     } : _ref$getFileName,
+    _ref$getFileNameWithU = _ref.getFileNameWithUUID,
+    getFileNameWithUUID = _ref$getFileNameWithU === void 0 ? function (_ref3) {
+      var _ref3$extension = _ref3.extension,
+        extension = _ref3$extension === void 0 ? null : _ref3$extension;
+      return "".concat(v1()).concat(extension !== null ? ".".concat(extension) : '');
+    } : _ref$getFileNameWithU,
+    _ref$withUUID = _ref.withUUID,
+    withUUID = _ref$withUUID === void 0 ? false : _ref$withUUID,
     _ref$meta = _ref.meta,
     meta = _ref$meta === void 0 ? null : _ref$meta,
     _ref$allowMultipleUpl = _ref.allowMultipleUploads,
@@ -1532,9 +1542,9 @@ var useUppy = function useUppy() {
     autoProceed = _ref$autoProceed === void 0 ? false : _ref$autoProceed,
     _ref$debug = _ref.debug,
     debug = _ref$debug === void 0 ? false : _ref$debug;
-  var _ref3 = useContext(UppyContext) || null,
-    buildUppy = _ref3.buildUppy,
-    transport = _ref3.transport;
+  var _ref4 = useContext(UppyContext) || null,
+    buildUppy = _ref4.buildUppy,
+    transport = _ref4.transport;
   var uppy = useMemo(function () {
     return buildUppy !== null ? buildUppy({
       meta: meta,
@@ -1573,12 +1583,17 @@ var useUppy = function useUppy() {
     if (uppy === null) {
       return function () {};
     }
-    var onUpload = function onUpload(_ref4) {
-      var _ref4$fileIDs = _ref4.fileIDs,
-        ids = _ref4$fileIDs === void 0 ? [] : _ref4$fileIDs;
+    var onUpload = function onUpload(_ref5) {
+      var _ref5$fileIDs = _ref5.fileIDs,
+        ids = _ref5$fileIDs === void 0 ? [] : _ref5$fileIDs;
       ids.forEach(function (id) {
         var file = uppy.getFile(id);
-        var newName = getFileName(file);
+        var newName = null;
+        if (withUUID) {
+          newName = getFileNameWithUUID(file);
+        } else {
+          newName = getFileName(file);
+        }
         if (newName !== null) {
           uppy.setFileMeta(id, {
             name: newName
@@ -1632,33 +1647,33 @@ var defaultProps = {
   tus: null,
   xhr: null
 };
-var UppyProvider = function UppyProvider(_ref5) {
-  var id = _ref5.id,
-    children = _ref5.children,
-    providedTransport = _ref5.transport,
-    providedLocale = _ref5.locale,
-    providedSources = _ref5.sources,
-    providedTransloadit = _ref5.transloadit,
-    providedCompanion = _ref5.companion,
-    providedTus = _ref5.tus,
-    providedXhr = _ref5.xhr;
+var UppyProvider = function UppyProvider(_ref6) {
+  var id = _ref6.id,
+    children = _ref6.children,
+    providedTransport = _ref6.transport,
+    providedLocale = _ref6.locale,
+    providedSources = _ref6.sources,
+    providedTransloadit = _ref6.transloadit,
+    providedCompanion = _ref6.companion,
+    providedTus = _ref6.tus,
+    providedXhr = _ref6.xhr;
   var _useIntl = useIntl(),
     intlLocale = _useIntl.locale;
-  var _ref6 = useContext(UppyContext) || {},
-    _ref6$transport = _ref6.transport,
-    contextTransport = _ref6$transport === void 0 ? null : _ref6$transport,
-    _ref6$locale = _ref6.locale,
-    contextLocale = _ref6$locale === void 0 ? null : _ref6$locale,
-    _ref6$sources = _ref6.sources,
-    contextSources = _ref6$sources === void 0 ? null : _ref6$sources,
-    _ref6$transloadit = _ref6.transloadit,
-    contextTransloadit = _ref6$transloadit === void 0 ? null : _ref6$transloadit,
-    _ref6$companion = _ref6.companion,
-    contextCompanion = _ref6$companion === void 0 ? null : _ref6$companion,
-    _ref6$tus = _ref6.tus,
-    contextTus = _ref6$tus === void 0 ? null : _ref6$tus,
-    _ref6$xhr = _ref6.xhr,
-    contextXhr = _ref6$xhr === void 0 ? null : _ref6$xhr;
+  var _ref7 = useContext(UppyContext) || {},
+    _ref7$transport = _ref7.transport,
+    contextTransport = _ref7$transport === void 0 ? null : _ref7$transport,
+    _ref7$locale = _ref7.locale,
+    contextLocale = _ref7$locale === void 0 ? null : _ref7$locale,
+    _ref7$sources = _ref7.sources,
+    contextSources = _ref7$sources === void 0 ? null : _ref7$sources,
+    _ref7$transloadit = _ref7.transloadit,
+    contextTransloadit = _ref7$transloadit === void 0 ? null : _ref7$transloadit,
+    _ref7$companion = _ref7.companion,
+    contextCompanion = _ref7$companion === void 0 ? null : _ref7$companion,
+    _ref7$tus = _ref7.tus,
+    contextTus = _ref7$tus === void 0 ? null : _ref7$tus,
+    _ref7$xhr = _ref7.xhr,
+    contextXhr = _ref7$xhr === void 0 ? null : _ref7$xhr;
   var transport = providedTransport || contextTransport || 'xhr';
   var locale = providedLocale || contextLocale || intlLocale;
   var sources = providedSources || contextSources || ['webcam', 'facebook', 'instagram', 'dropbox', 'google-drive'];
@@ -1676,10 +1691,10 @@ var UppyProvider = function UppyProvider(_ref5) {
     }
     return function () {
       var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      var _ref7 = opts || {},
-        _ref7$sources = _ref7.sources,
-        customSources = _ref7$sources === void 0 ? sources : _ref7$sources,
-        uppyOpts = _objectWithoutProperties(_ref7, _excluded);
+      var _ref8 = opts || {},
+        _ref8$sources = _ref8.sources,
+        customSources = _ref8$sources === void 0 ? sources : _ref8$sources,
+        uppyOpts = _objectWithoutProperties(_ref8, _excluded);
       var newUppy = new Uppy(_objectSpread({
         id: id,
         locale: uppyLocale
@@ -1716,12 +1731,12 @@ var UppyProvider = function UppyProvider(_ref5) {
           if (source === null) {
             return currentUppy;
           }
-          var _ref8 = companion || {
+          var _ref9 = companion || {
               url: uppyTransport.COMPANION || null,
               allowedHosts: uppyTransport.COMPANION_PATTERN || null
             },
-            companionUrl = _ref8.url,
-            companionAllowedHosts = _ref8.allowedHosts;
+            companionUrl = _ref9.url,
+            companionAllowedHosts = _ref9.allowedHosts;
           return newUppy.use(source, {
             id: sourceId,
             companionUrl: companionUrl,

package/lib/contexts.js

@@ -19,6 +19,7 @@ var utils = require('@panneau/core/utils');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var reactRouter = require('react-router');
 var tracking = require('@folklore/tracking');
+var slugify = require('slugify');
 var uuid = require('uuid');
 var EventEmitter = require('wolfy87-eventemitter');
 
@@ -52,6 +53,7 @@ var uniqBy__default = /*#__PURE__*/_interopDefaultLegacy(uniqBy);
 var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
 var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
 var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
+var slugify__default = /*#__PURE__*/_interopDefaultLegacy(slugify);
 var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
 
 var MODALS_NAMESPACE = 'modals';
@@ -1551,10 +1553,19 @@ var useUppy = function useUppy() {
     onFail = _ref$onFail === void 0 ? null : _ref$onFail,
     _ref$getFileName = _ref.getFileName,
     getFileName = _ref$getFileName === void 0 ? function (_ref2) {
-      var _ref2$extension = _ref2.extension,
+      var filename = _ref2.filename,
+        _ref2$extension = _ref2.extension,
         extension = _ref2$extension === void 0 ? null : _ref2$extension;
-      return "".concat(uuid.v1()).concat(extension !== null ? ".".concat(extension) : '');
+      return "".concat((slugify__default["default"](filename) || '').substring(0, 50)).concat(extension !== null ? ".".concat(extension) : '');
     } : _ref$getFileName,
+    _ref$getFileNameWithU = _ref.getFileNameWithUUID,
+    getFileNameWithUUID = _ref$getFileNameWithU === void 0 ? function (_ref3) {
+      var _ref3$extension = _ref3.extension,
+        extension = _ref3$extension === void 0 ? null : _ref3$extension;
+      return "".concat(uuid.v1()).concat(extension !== null ? ".".concat(extension) : '');
+    } : _ref$getFileNameWithU,
+    _ref$withUUID = _ref.withUUID,
+    withUUID = _ref$withUUID === void 0 ? false : _ref$withUUID,
     _ref$meta = _ref.meta,
     meta = _ref$meta === void 0 ? null : _ref$meta,
     _ref$allowMultipleUpl = _ref.allowMultipleUploads,
@@ -1567,9 +1578,9 @@ var useUppy = function useUppy() {
     autoProceed = _ref$autoProceed === void 0 ? false : _ref$autoProceed,
     _ref$debug = _ref.debug,
     debug = _ref$debug === void 0 ? false : _ref$debug;
-  var _ref3 = React.useContext(UppyContext) || null,
-    buildUppy = _ref3.buildUppy,
-    transport = _ref3.transport;
+  var _ref4 = React.useContext(UppyContext) || null,
+    buildUppy = _ref4.buildUppy,
+    transport = _ref4.transport;
   var uppy = React.useMemo(function () {
     return buildUppy !== null ? buildUppy({
       meta: meta,
@@ -1608,12 +1619,17 @@ var useUppy = function useUppy() {
     if (uppy === null) {
       return function () {};
     }
-    var onUpload = function onUpload(_ref4) {
-      var _ref4$fileIDs = _ref4.fileIDs,
-        ids = _ref4$fileIDs === void 0 ? [] : _ref4$fileIDs;
+    var onUpload = function onUpload(_ref5) {
+      var _ref5$fileIDs = _ref5.fileIDs,
+        ids = _ref5$fileIDs === void 0 ? [] : _ref5$fileIDs;
       ids.forEach(function (id) {
         var file = uppy.getFile(id);
-        var newName = getFileName(file);
+        var newName = null;
+        if (withUUID) {
+          newName = getFileNameWithUUID(file);
+        } else {
+          newName = getFileName(file);
+        }
         if (newName !== null) {
           uppy.setFileMeta(id, {
             name: newName
@@ -1667,33 +1683,33 @@ var defaultProps = {
   tus: null,
   xhr: null
 };
-var UppyProvider = function UppyProvider(_ref5) {
-  var id = _ref5.id,
-    children = _ref5.children,
-    providedTransport = _ref5.transport,
-    providedLocale = _ref5.locale,
-    providedSources = _ref5.sources,
-    providedTransloadit = _ref5.transloadit,
-    providedCompanion = _ref5.companion,
-    providedTus = _ref5.tus,
-    providedXhr = _ref5.xhr;
+var UppyProvider = function UppyProvider(_ref6) {
+  var id = _ref6.id,
+    children = _ref6.children,
+    providedTransport = _ref6.transport,
+    providedLocale = _ref6.locale,
+    providedSources = _ref6.sources,
+    providedTransloadit = _ref6.transloadit,
+    providedCompanion = _ref6.companion,
+    providedTus = _ref6.tus,
+    providedXhr = _ref6.xhr;
   var _useIntl = reactIntl.useIntl(),
     intlLocale = _useIntl.locale;
-  var _ref6 = React.useContext(UppyContext) || {},
-    _ref6$transport = _ref6.transport,
-    contextTransport = _ref6$transport === void 0 ? null : _ref6$transport,
-    _ref6$locale = _ref6.locale,
-    contextLocale = _ref6$locale === void 0 ? null : _ref6$locale,
-    _ref6$sources = _ref6.sources,
-    contextSources = _ref6$sources === void 0 ? null : _ref6$sources,
-    _ref6$transloadit = _ref6.transloadit,
-    contextTransloadit = _ref6$transloadit === void 0 ? null : _ref6$transloadit,
-    _ref6$companion = _ref6.companion,
-    contextCompanion = _ref6$companion === void 0 ? null : _ref6$companion,
-    _ref6$tus = _ref6.tus,
-    contextTus = _ref6$tus === void 0 ? null : _ref6$tus,
-    _ref6$xhr = _ref6.xhr,
-    contextXhr = _ref6$xhr === void 0 ? null : _ref6$xhr;
+  var _ref7 = React.useContext(UppyContext) || {},
+    _ref7$transport = _ref7.transport,
+    contextTransport = _ref7$transport === void 0 ? null : _ref7$transport,
+    _ref7$locale = _ref7.locale,
+    contextLocale = _ref7$locale === void 0 ? null : _ref7$locale,
+    _ref7$sources = _ref7.sources,
+    contextSources = _ref7$sources === void 0 ? null : _ref7$sources,
+    _ref7$transloadit = _ref7.transloadit,
+    contextTransloadit = _ref7$transloadit === void 0 ? null : _ref7$transloadit,
+    _ref7$companion = _ref7.companion,
+    contextCompanion = _ref7$companion === void 0 ? null : _ref7$companion,
+    _ref7$tus = _ref7.tus,
+    contextTus = _ref7$tus === void 0 ? null : _ref7$tus,
+    _ref7$xhr = _ref7.xhr,
+    contextXhr = _ref7$xhr === void 0 ? null : _ref7$xhr;
   var transport = providedTransport || contextTransport || 'xhr';
   var locale = providedLocale || contextLocale || intlLocale;
   var sources = providedSources || contextSources || ['webcam', 'facebook', 'instagram', 'dropbox', 'google-drive'];
@@ -1711,10 +1727,10 @@ var UppyProvider = function UppyProvider(_ref5) {
     }
     return function () {
       var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      var _ref7 = opts || {},
-        _ref7$sources = _ref7.sources,
-        customSources = _ref7$sources === void 0 ? sources : _ref7$sources,
-        uppyOpts = _objectWithoutProperties__default["default"](_ref7, _excluded);
+      var _ref8 = opts || {},
+        _ref8$sources = _ref8.sources,
+        customSources = _ref8$sources === void 0 ? sources : _ref8$sources,
+        uppyOpts = _objectWithoutProperties__default["default"](_ref8, _excluded);
       var newUppy = new Uppy(_objectSpread__default["default"]({
         id: id,
         locale: uppyLocale
@@ -1751,12 +1767,12 @@ var UppyProvider = function UppyProvider(_ref5) {
           if (source === null) {
             return currentUppy;
           }
-          var _ref8 = companion || {
+          var _ref9 = companion || {
               url: uppyTransport.COMPANION || null,
               allowedHosts: uppyTransport.COMPANION_PATTERN || null
             },
-            companionUrl = _ref8.url,
-            companionAllowedHosts = _ref8.allowedHosts;
+            companionUrl = _ref9.url,
+            companionAllowedHosts = _ref9.allowedHosts;
           return newUppy.use(source, {
             id: sourceId,
             companionUrl: companionUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/core",
-    "version": "2.0.86",
+    "version": "2.0.91",
     "description": "",
     "keywords": [
         "javascript"
@@ -114,5 +114,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "f338f69fba3beeaa8c16350b24b32144f9316d72"
+    "gitHead": "a0ea54191eb4d1f28d0918203f483f11d7b9e52f"
 }