@comet/cms-admin 8.6.0-canary-20251105084935 → 8.6.0-canary-20251105093252

package/lib/dam/DataGrid/fileUpload/useDamFileUpload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDamFileUpload.d.ts","sourceRoot":"","sources":["../../../../src/dam/DataGrid/fileUpload/useDamFileUpload.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAA0C,MAAM,OAAO,CAAC;AAC/E,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAKjE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAYlE,OAAO,EAAE,KAAK,iBAAiB,EAAwB,MAAM,qBAAqB,CAAC;AAoBnF,MAAM,WAAW,yBAA0B,SAAQ,IAAI;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B;AAED,MAAM,WAAW,kBAAmB,SAAQ,yBAAyB;IACjE,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,oBAAoB;IAC1B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,UAAU,KAAK;IACX,aAAa,EAAE,yBAAyB,EAAE,CAAC;IAC3C,cAAc,EAAE,aAAa,EAAE,CAAC;CACnC;AAED,KAAK,YAAY,GAAG;IAAE,gBAAgB,EAAE,KAAK,CAAC;IAAC,cAAc,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,gBAAgB,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9H,UAAU,kBAAkB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B;AAED,MAAM,WAAW,aAAa;IAC1B,WAAW,EAAE,CACT,EAAE,aAAa,EAAE,cAAc,EAAE,EAAE,KAAK,EACxC,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,kBAAkB,KAC7C,OAAO,CAAC;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,aAAa,EAAE,YAAY,EAAE,CAAC;QAAC,aAAa,EAAE,iBAAiB,EAAE,CAAA;KAAE,CAAC,CAAC;IACvG,gBAAgB,CAAC,EAAE,yBAAyB,EAAE,CAAC;IAC/C,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,SAAS,CAAC;IACnB,cAAc,EAAE;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,OAAO,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,kBAAkB,EAAE,iBAAiB,EAAE,CAAC;CAC3C;AAED,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IAChD,OAAO,EAAE,SAAS,CAAC;CACtB;AAED,UAAU,YAAY;IAClB,IAAI,EAAE,IAAI,CAAC;CACd;AAwCD,eAAO,MAAM,gBAAgB,GAAI,SAAS,oBAAoB,KAAG,aA2XhE,CAAC"}
+{"version":3,"file":"useDamFileUpload.d.ts","sourceRoot":"","sources":["../../../../src/dam/DataGrid/fileUpload/useDamFileUpload.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAkC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAKjE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAWlE,OAAO,EAAE,KAAK,iBAAiB,EAAwB,MAAM,qBAAqB,CAAC;AAoBnF,MAAM,WAAW,yBAA0B,SAAQ,IAAI;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B;AAED,MAAM,WAAW,kBAAmB,SAAQ,yBAAyB;IACjE,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,oBAAoB;IAC1B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,UAAU,KAAK;IACX,aAAa,EAAE,yBAAyB,EAAE,CAAC;IAC3C,cAAc,EAAE,aAAa,EAAE,CAAC;CACnC;AAED,KAAK,YAAY,GAAG;IAAE,gBAAgB,EAAE,KAAK,CAAC;IAAC,cAAc,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,gBAAgB,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9H,UAAU,kBAAkB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B;AAED,MAAM,WAAW,aAAa;IAC1B,WAAW,EAAE,CACT,EAAE,aAAa,EAAE,cAAc,EAAE,EAAE,KAAK,EACxC,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,kBAAkB,KAC7C,OAAO,CAAC;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,aAAa,EAAE,YAAY,EAAE,CAAC;QAAC,aAAa,EAAE,iBAAiB,EAAE,CAAA;KAAE,CAAC,CAAC;IACvG,gBAAgB,CAAC,EAAE,yBAAyB,EAAE,CAAC;IAC/C,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,SAAS,CAAC;IACnB,cAAc,EAAE;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,OAAO,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,kBAAkB,EAAE,iBAAiB,EAAE,CAAC;CAC3C;AAED,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IAChD,OAAO,EAAE,SAAS,CAAC;CACtB;AAED,UAAU,YAAY;IAClB,IAAI,EAAE,IAAI,CAAC;CACd;AAwCD,eAAO,MAAM,gBAAgB,GAAI,SAAS,oBAAoB,KAAG,aAyXhE,CAAC"}

package/lib/dam/DataGrid/fileUpload/useDamFileUpload.js

@@ -5,12 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useDamFileUpload = void 0;
 var _client = require("@apollo/client");
-var _axios = _interopRequireDefault(require("axios"));
 var _react = require("react");
 var _errorMessages = require("../../../common/errors/errorMessages");
 var _CometConfigContext = require("../../../config/CometConfigContext");
 var _upload = require("../../../form/file/upload");
-var _createHttpClient = require("../../../http/createHttpClient");
 var _damConfig = require("../../config/damConfig");
 var _useDamAcceptedMimeTypes = require("../../config/useDamAcceptedMimeTypes");
 var _useDamScope = require("../../config/useDamScope");
@@ -24,7 +22,6 @@ var _ProgressDialog = require("./ProgressDialog");
 var _useDamFileUpload = require("./useDamFileUpload.gql");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["errors"];
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regeneratorValues(e) { if (null != e) { var t = e["function" == typeof Symbol && Symbol.iterator || "@@iterator"], r = 0; if (t) return t.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) return { next: function next() { return e && r >= e.length && (e = void 0), { value: e && e[r++], done: !e }; } }; } throw new TypeError(_typeof(e) + " is not iterable"); }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
@@ -165,7 +162,6 @@ var useDamFileUpload = exports.useDamFileUpload = function useDamFileUpload(opti
   }, 0) : undefined;
   var maxFileSizeInMegabytes = damConfig.uploadsMaxFileSize;
   var maxFileSizeInBytes = maxFileSizeInMegabytes * 1024 * 1024;
-  var cancelUpload = (0, _react.useRef)();
   var addValidationError = function addValidationError(file, newError) {
     setValidationErrors(function (prevErrors) {
       var existingErrors = prevErrors !== null && prevErrors !== void 0 ? prevErrors : [];
@@ -544,11 +540,10 @@ var useDamFileUpload = exports.useDamFileUpload = function useDamFileUpload(opti
             _yield$handleDuplicat = _context8.v;
             filesToUpload = _yield$handleDuplicat.filesToUpload;
             duplicateAction = _yield$handleDuplicat.duplicateAction;
-            cancelUpload.current = _axios["default"].CancelToken.source();
             _iterator6 = _createForOfIteratorHelper(filesToUpload);
             _context8.p = 4;
             _loop = /*#__PURE__*/_regenerator().m(function _loop() {
-              var file, _yield$createFoldersI, newFolderIdMap, newlyCreatedFolderIds, targetFolderId, uploadConfig, onUploadProgress, uploadParams, response, _typedErr$response, _typedErr$response2, _typedErr$response3, typedErr, message, extension, _t3, _t4;
+              var file, _yield$createFoldersI, newFolderIdMap, newlyCreatedFolderIds, targetFolderId, uploadConfig, onUploadProgress, uploadParams, uploadResult, response, _err$response, _err$response2, message, extension, _t3, _t4;
               return _regenerator().w(function (_context7) {
                 while (1) switch (_context7.p = _context7.n) {
                   case 0:
@@ -581,9 +576,8 @@ var useDamFileUpload = exports.useDamFileUpload = function useDamFileUpload(opti
                       updateLoadedSize((_file$path5 = file.path) !== null && _file$path5 !== void 0 ? _file$path5 : "", progressEvent.loaded);
                     };
                     uploadParams = {
-                      apiClient: (0, _createHttpClient.createHttpClient)(apiUrl),
+                      apiUrl: apiUrl,
                       data: uploadConfig,
-                      cancelToken: cancelUpload.current.token,
                       options: {
                         onUploadProgress: onUploadProgress
                       },
@@ -605,26 +599,29 @@ var useDamFileUpload = exports.useDamFileUpload = function useDamFileUpload(opti
                   case 5:
                     _t3 = _context7.v;
                   case 6:
-                    response = _t3;
+                    uploadResult = _t3;
+                    _context7.n = 7;
+                    return uploadResult;
+                  case 7:
+                    response = _context7.v;
                     uploadedFiles.push({
                       id: response.data.id,
                       parentId: targetFolderId,
                       type: "file",
                       file: file
                     });
-                    _context7.n = 8;
+                    _context7.n = 9;
                     break;
-                  case 7:
-                    _context7.p = 7;
+                  case 8:
+                    _context7.p = 8;
                     _t4 = _context7.v;
                     errorOccurred = true;
-                    typedErr = _t4;
-                    if (hasObjectErrorData(typedErr) && ((_typedErr$response = typedErr.response) === null || _typedErr$response === void 0 ? void 0 : _typedErr$response.data.error) === "CometImageResolutionException") {
+                    if (hasObjectErrorData(_t4) && ((_err$response = _t4.response) === null || _err$response === void 0 ? void 0 : _err$response.data.error) === "CometImageResolutionException") {
                       addValidationError(file, /*#__PURE__*/(0, _jsxRuntime.jsx)(_fileUploadErrorMessages.MaxResolutionError, {
                         maxResolution: damConfig.maxSrcResolution
                       }));
-                    } else if (hasObjectErrorData(typedErr) && ((_typedErr$response2 = typedErr.response) === null || _typedErr$response2 === void 0 ? void 0 : _typedErr$response2.data.error) === "CometValidationException") {
-                      message = typedErr.response.data.message;
+                    } else if (hasObjectErrorData(_t4) && ((_err$response2 = _t4.response) === null || _err$response2 === void 0 ? void 0 : _err$response2.data.error) === "CometValidationException") {
+                      message = _t4.response.data.message;
                       extension = ".".concat(file.name.split(".").pop());
                       if (message.includes("Unsupported mime type")) {
                         addValidationError(file, /*#__PURE__*/(0, _jsxRuntime.jsx)(_fileUploadErrorMessages.UnsupportedTypeError, {
@@ -642,9 +639,9 @@ var useDamFileUpload = exports.useDamFileUpload = function useDamFileUpload(opti
                       } else {
                         addValidationError(file, /*#__PURE__*/(0, _jsxRuntime.jsx)(_errorMessages.UnknownError, {}));
                       }
-                    } else if (hasStringErrorData(typedErr) && (_typedErr$response3 = typedErr.response) !== null && _typedErr$response3 !== void 0 && _typedErr$response3.data.includes("SVG contains forbidden content")) {
+                    } else if (hasStringErrorData(_t4) && _t4.response.data.includes("SVG contains forbidden content")) {
                       addValidationError(file, /*#__PURE__*/(0, _jsxRuntime.jsx)(_fileUploadErrorMessages.SvgContainsJavaScriptError, {}));
-                    } else if (typedErr.response === undefined && typedErr.request) {
+                    } else if (hasRequestData(_t4)) {
                       addValidationError(file, /*#__PURE__*/(0, _jsxRuntime.jsx)(_errorMessages.NetworkError, {}));
                     } else {
                       addValidationError(file, /*#__PURE__*/(0, _jsxRuntime.jsx)(_errorMessages.UnknownError, {}));
@@ -652,10 +649,10 @@ var useDamFileUpload = exports.useDamFileUpload = function useDamFileUpload(opti
                     rejectedFiles.push({
                       file: file
                     });
-                  case 8:
+                  case 9:
                     return _context7.a(2);
                 }
-              }, _loop, null, [[2, 7]]);
+              }, _loop, null, [[2, 8]]);
             });
             _iterator6.s();
           case 5:
@@ -729,11 +726,27 @@ var useDamFileUpload = exports.useDamFileUpload = function useDamFileUpload(opti
     newlyUploadedItems: newlyUploadedItems
   };
 };
-var hasObjectErrorData = function hasObjectErrorData(err) {
-  var _err$response, _err$response2;
-  return _typeof((_err$response = err.response) === null || _err$response === void 0 ? void 0 : _err$response.data) === "object" && ((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : _err$response2.data.error) !== undefined;
-};
-var hasStringErrorData = function hasStringErrorData(err) {
-  var _err$response3;
-  return typeof ((_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : _err$response3.data) === "string";
-};
+function hasRequestData(err) {
+  return _typeof(err) === "object" && err !== null && "request" in err && err.request !== undefined && (!("response" in err) || err.response === undefined);
+}
+function hasObjectErrorData(err) {
+  if (_typeof(err) === "object" && err !== null && "response" in err) {
+    var response = err.response;
+    if (_typeof(response) === "object" && response !== null && "data" in response) {
+      var data = response.data;
+      if (_typeof(data) === "object" && data !== null && "error" in data && typeof data.error === "string") {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function hasStringErrorData(err) {
+  if (_typeof(err) === "object" && err !== null && "response" in err) {
+    var response = err.response;
+    if (_typeof(response) === "object" && response !== null && "data" in response && typeof response.data === "string") {
+      return true;
+    }
+  }
+  return false;
+}

package/lib/dam/FileForm/ReplaceFileButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReplaceFileButton.d.ts","sourceRoot":"","sources":["../../../src/dam/FileForm/ReplaceFileButton.tsx"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,UAAU,sBAAsB;IAC5B,IAAI,EAAE,cAAc,CAAC;CACxB;AAED,wBAAgB,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE,sBAAsB,2CA6EjE"}
+{"version":3,"file":"ReplaceFileButton.d.ts","sourceRoot":"","sources":["../../../src/dam/FileForm/ReplaceFileButton.tsx"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,UAAU,sBAAsB;IAC5B,IAAI,EAAE,cAAc,CAAC;CACxB;AAED,wBAAgB,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE,sBAAsB,2CAkFjE"}

package/lib/dam/FileForm/ReplaceFileButton.js

@@ -8,17 +8,14 @@ exports.ReplaceFileButton = ReplaceFileButton;
 var _client = require("@apollo/client");
 var _admin = require("@comet/admin");
 var _adminIcons = require("@comet/admin-icons");
-var _axios = _interopRequireDefault(require("axios"));
 var _react = require("react");
 var _reactDropzone = require("react-dropzone");
 var _reactIntl = require("react-intl");
 var _CometConfigContext = require("../../config/CometConfigContext");
 var _upload = require("../../form/file/upload");
-var _createHttpClient = require("../../http/createHttpClient");
 var _damConfig = require("../config/damConfig");
 var _fileUpload = require("../DataGrid/fileUpload/fileUpload.utils");
 var _jsxRuntime = require("react/jsx-runtime");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -42,9 +39,9 @@ function ReplaceFileButton(_ref) {
   var damConfig = (0, _damConfig.useDamConfig)();
   var damBasePath = (0, _damConfig.useDamBasePath)();
   var fileInputRef = (0, _react.useRef)(null);
+  var abortControllerRef = (0, _react.useRef)(null);
   var maxFileSizeInMegabytes = damConfig.uploadsMaxFileSize;
   var maxFileSizeInBytes = maxFileSizeInMegabytes * 1024 * 1024;
-  var cancelUpload = (0, _react.useRef)(_axios["default"].CancelToken.source());
   var errorDialog = (0, _admin.useErrorDialog)();
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -56,7 +53,7 @@ function ReplaceFileButton(_ref) {
       accept: (0, _fileUpload.convertMimetypesToDropzoneAccept)([file.mimetype]),
       onDrop: function () {
         var _onDrop = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(acceptedFiles, fileRejections) {
-          var response, _response$data, fileUrl, _error$response, _t;
+          var abortController, response, _response$data, fileUrl, _t;
           return _regenerator().w(function (_context) {
             while (1) switch (_context.p = _context.n) {
               case 0:
@@ -71,19 +68,23 @@ function ReplaceFileButton(_ref) {
                 }
                 _context.p = 1;
                 setReplaceLoading(true);
+                if (abortControllerRef.current) {
+                  abortControllerRef.current.abort();
+                }
+                abortController = new AbortController();
+                abortControllerRef.current = abortController;
                 _context.n = 2;
                 return (0, _upload.replaceById)({
-                  apiClient: (0, _createHttpClient.createHttpClient)(apiUrl),
+                  apiUrl: apiUrl,
                   data: {
                     file: acceptedFiles[0],
                     fileId: file.id
                   },
-                  cancelToken: cancelUpload.current.token,
                   damBasePath: damBasePath
                 });
               case 2:
                 response = _context.v;
-                if (response.status === 201 && response.data) {
+                if (response.data) {
                   fileUrl = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.fileUrl;
                   if (fileUrl) {
                     apolloClient.cache.evict({
@@ -92,21 +93,26 @@ function ReplaceFileButton(_ref) {
                   }
                 }
                 setReplaceLoading(false);
-                _context.n = 4;
+                _context.n = 5;
                 break;
               case 3:
                 _context.p = 3;
                 _t = _context.v;
-                if (_axios["default"].isAxiosError(_t)) {
-                  errorDialog === null || errorDialog === void 0 || errorDialog.showError({
-                    userMessage: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-                      id: "comet.dam.file.replace.error",
-                      defaultMessage: "An error occurred while replacing the file. Please try again later."
-                    }),
-                    error: (_error$response = _t.response) === null || _error$response === void 0 ? void 0 : _error$response.data
-                  });
+                if (!(_t instanceof DOMException && _t.name === "AbortError")) {
+                  _context.n = 4;
+                  break;
                 }
+                setReplaceLoading(false);
+                return _context.a(2);
               case 4:
+                errorDialog === null || errorDialog === void 0 || errorDialog.showError({
+                  userMessage: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+                    id: "comet.dam.file.replace.error",
+                    defaultMessage: "An error occurred while replacing the file. Please try again later."
+                  }),
+                  error: _t instanceof Error ? _t.message : String(_t)
+                });
+              case 5:
                 return _context.a(2);
             }
           }, _callee, null, [[1, 3]]);

package/lib/form/file/upload.d.ts

@@ -1,4 +1,3 @@
-import { type AxiosInstance, type AxiosRequestConfig, type AxiosResponse, type CancelToken } from "axios";
 import { type GQLUpdateDamFileInput } from "../../graphql.generated";
 interface UploadFileData {
     file: File & Pick<GQLUpdateDamFileInput, "license" | "title" | "altText"> & {
@@ -19,20 +18,27 @@ interface UploadFileData {
     importSourceType?: string;
 }
 interface UploadFileParams {
-    apiClient: AxiosInstance;
+    apiUrl: string;
     data: UploadFileData;
-    cancelToken: CancelToken;
-    options?: Omit<AxiosRequestConfig, "cancelToken">;
+    options?: {
+        onUploadProgress?: (event: ProgressEvent) => void;
+    };
     damBasePath: string;
 }
-export declare function upload<ResponseData>(uploadFileParams: UploadFileParams): Promise<AxiosResponse<ResponseData>>;
-export declare function replaceByFilenameAndFolder<ResponseData>(uploadFileParams: UploadFileParams): Promise<AxiosResponse<ResponseData>>;
+export declare function upload<ResponseData>(uploadFileParams: UploadFileParams): Promise<{
+    data: ResponseData;
+}>;
+export declare function replaceByFilenameAndFolder<ResponseData>(uploadFileParams: UploadFileParams): Promise<{
+    data: ResponseData;
+}>;
 interface ReplaceFileByIdData {
     file: File & Pick<GQLUpdateDamFileInput, "license" | "title" | "altText">;
     fileId: string;
 }
-export declare function replaceById<ResponseData>({ apiClient, data, cancelToken, options, damBasePath, }: Omit<UploadFileParams, "data"> & {
+export declare function replaceById({ apiUrl, data, damBasePath }: Omit<UploadFileParams, "data"> & {
     data: ReplaceFileByIdData;
-}): Promise<AxiosResponse<ResponseData>>;
+}): Promise<{
+    data: any;
+}>;
 export {};
 //# sourceMappingURL=upload.d.ts.map

package/lib/form/file/upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../src/form/file/upload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAE,KAAK,aAAa,EAAE,KAAK,WAAW,EAAE,MAAM,OAAO,CAAC;AAE1G,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAErE,UAAU,cAAc;IACpB,IAAI,EAAE,IAAI,GACN,IAAI,CAAC,qBAAqB,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC,GAAG;QAAE,YAAY,CAAC,EAAE;YAAE,gBAAgB,EAAE,MAAM,CAAC;YAAC,cAAc,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;IAC3I,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,UAAU,gBAAgB;IACtB,SAAS,EAAE,aAAa,CAAC;IACzB,IAAI,EAAE,cAAc,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;IAClD,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,MAAM,CAAC,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAE7G;AAED,wBAAgB,0BAA0B,CAAC,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAEjI;AA8CD,UAAU,mBAAmB;IACzB,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC,qBAAqB,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC,CAAC;IAC1E,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,WAAW,CAAC,YAAY,EAAE,EACtC,SAAS,EACT,IAAI,EACJ,WAAW,EACX,OAAO,EACP,WAAW,GACd,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG;IAAE,IAAI,EAAE,mBAAmB,CAAA;CAAE,GAAG,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAqBvG"}
+{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../src/form/file/upload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAErE,UAAU,cAAc;IACpB,IAAI,EAAE,IAAI,GACN,IAAI,CAAC,qBAAqB,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC,GAAG;QAAE,YAAY,CAAC,EAAE;YAAE,gBAAgB,EAAE,MAAM,CAAC;YAAC,cAAc,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;IAC3I,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AACD,UAAU,gBAAgB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,CAAC,EAAE;QAAE,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAA;KAAE,CAAC;IAChE,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,MAAM,CAAC,YAAY,EAAE,gBAAgB,EAAE,gBAAgB;;GAItE;AAED,wBAAgB,0BAA0B,CAAC,YAAY,EAAE,gBAAgB,EAAE,gBAAgB;;GAI1F;AA0CD,UAAU,mBAAmB;IACzB,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC,qBAAqB,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC,CAAC;IAC1E,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG;IAAE,IAAI,EAAE,mBAAmB,CAAA;CAAE;;GA0BxH"}

package/lib/form/file/upload.js

@@ -7,80 +7,122 @@ exports.replaceByFilenameAndFolder = replaceByFilenameAndFolder;
 exports.replaceById = replaceById;
 exports.upload = upload;
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function upload(uploadFileParams) {
-  return uploadOrReplaceByFilenameAndFolder(uploadFileParams);
+  var controller = new AbortController();
+  var promise = uploadOrReplaceByFilenameAndFolder(uploadFileParams, controller.signal);
+  return promise;
 }
 function replaceByFilenameAndFolder(uploadFileParams) {
-  return uploadOrReplaceByFilenameAndFolder(_objectSpread(_objectSpread({}, uploadFileParams), {}, {
+  var controller = new AbortController();
+  var promise = uploadOrReplaceByFilenameAndFolder(_objectSpread(_objectSpread({}, uploadFileParams), {}, {
     replace: true
-  }));
+  }), controller.signal);
+  return promise;
+}
+function uploadOrReplaceByFilenameAndFolder(_x, _x2) {
+  return _uploadOrReplaceByFilenameAndFolder.apply(this, arguments);
 }
-function uploadOrReplaceByFilenameAndFolder(_ref) {
-  var apiClient = _ref.apiClient,
-    data = _ref.data,
-    cancelToken = _ref.cancelToken,
-    options = _ref.options,
-    _ref$replace = _ref.replace,
-    replace = _ref$replace === void 0 ? false : _ref$replace,
-    damBasePath = _ref.damBasePath;
-  var formData = new FormData();
-  formData.append("file", data.file);
-  formData.append("scope", JSON.stringify(data.scope));
-  if (data.importSourceId && data.importSourceType && !data.file.importSource) {
-    formData.append("importSourceId", data.importSourceId);
-    formData.append("importSourceType", data.importSourceType);
-  }
-  if (data.file.importSource) {
-    formData.append("importSourceId", data.file.importSource.importSourceId);
-    formData.append("importSourceType", data.file.importSource.importSourceType);
-  }
-  if (data.file.license) {
-    formData.append("license", JSON.stringify(data.file.license));
-  }
-  if (data.file.title) {
-    formData.append("title", data.file.title);
-  }
-  if (data.file.altText) {
-    formData.append("altText", data.file.altText);
-  }
-  if (data.folderId !== undefined) {
-    formData.append("folderId", data.folderId);
-  }
-  var endpoint = replace ? "/".concat(damBasePath, "/files/replace-by-filename-and-folder") : "/".concat(damBasePath, "/files/upload");
-  return apiClient.post(endpoint, formData, _objectSpread(_objectSpread({}, options), {}, {
-    cancelToken: cancelToken,
-    headers: {
-      "Content-Type": "multipart/form-data"
-    }
+function _uploadOrReplaceByFilenameAndFolder() {
+  _uploadOrReplaceByFilenameAndFolder = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref, signal) {
+    var apiUrl, data, _ref$replace, replace, damBasePath, formData, endpoint, url, response, dataJson;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          apiUrl = _ref.apiUrl, data = _ref.data, _ref$replace = _ref.replace, replace = _ref$replace === void 0 ? false : _ref$replace, damBasePath = _ref.damBasePath;
+          formData = new FormData();
+          formData.append("file", data.file);
+          formData.append("scope", JSON.stringify(data.scope));
+          if (data.importSourceId && data.importSourceType && !data.file.importSource) {
+            formData.append("importSourceId", data.importSourceId);
+            formData.append("importSourceType", data.importSourceType);
+          }
+          if (data.file.importSource) {
+            formData.append("importSourceId", data.file.importSource.importSourceId);
+            formData.append("importSourceType", data.file.importSource.importSourceType);
+          }
+          if (data.file.license) {
+            formData.append("license", JSON.stringify(data.file.license));
+          }
+          if (data.file.title) {
+            formData.append("title", data.file.title);
+          }
+          if (data.file.altText) {
+            formData.append("altText", data.file.altText);
+          }
+          if (data.folderId !== undefined) {
+            formData.append("folderId", data.folderId);
+          }
+          endpoint = replace ? "/".concat(damBasePath, "/files/replace-by-filename-and-folder") : "/".concat(damBasePath, "/files/upload");
+          url = apiUrl + endpoint;
+          _context2.n = 1;
+          return fetch(url, {
+            method: "POST",
+            body: formData,
+            signal: signal
+          });
+        case 1:
+          response = _context2.v;
+          _context2.n = 2;
+          return response.json();
+        case 2:
+          dataJson = _context2.v;
+          return _context2.a(2, {
+            data: dataJson
+          });
+      }
+    }, _callee2);
   }));
+  return _uploadOrReplaceByFilenameAndFolder.apply(this, arguments);
 }
 function replaceById(_ref2) {
-  var apiClient = _ref2.apiClient,
+  var apiUrl = _ref2.apiUrl,
     data = _ref2.data,
-    cancelToken = _ref2.cancelToken,
-    options = _ref2.options,
     damBasePath = _ref2.damBasePath;
-  var formData = new FormData();
-  formData.append("file", data.file);
-  formData.append("fileId", data.fileId);
-  if (data.file.license) {
-    formData.append("license", JSON.stringify(data.file.license));
-  }
-  if (data.file.title) {
-    formData.append("title", data.file.title);
-  }
-  if (data.file.altText) {
-    formData.append("altText", data.file.altText);
-  }
-  return apiClient.post("/".concat(damBasePath, "/files/replace-by-id"), formData, _objectSpread(_objectSpread({}, options), {}, {
-    cancelToken: cancelToken,
-    headers: {
-      "Content-Type": "multipart/form-data"
-    }
-  }));
+  var controller = new AbortController();
+  var promise = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+    var formData, url, response, dataJson;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          formData = new FormData();
+          formData.append("file", data.file);
+          formData.append("fileId", data.fileId);
+          if (data.file.license) {
+            formData.append("license", JSON.stringify(data.file.license));
+          }
+          if (data.file.title) {
+            formData.append("title", data.file.title);
+          }
+          if (data.file.altText) {
+            formData.append("altText", data.file.altText);
+          }
+          url = "".concat(apiUrl, "/").concat(damBasePath, "/files/replace-by-id");
+          _context.n = 1;
+          return fetch(url, {
+            method: "POST",
+            body: formData,
+            signal: controller.signal
+          });
+        case 1:
+          response = _context.v;
+          _context.n = 2;
+          return response.json();
+        case 2:
+          dataJson = _context.v;
+          return _context.a(2, {
+            data: dataJson
+          });
+      }
+    }, _callee);
+  }))();
+  return promise;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/cms-admin",
-  "version": "8.6.0-canary-20251105084935",
+  "version": "8.6.0-canary-20251105093252",
   "description": "Comet CMS Admin package",
   "repository": {
     "directory": "packages/admin/cms-admin",
@@ -41,10 +41,10 @@
     "slugify": "^1.6.6",
     "use-debounce": "^10.0.5",
     "uuid": "^11.1.0",
-    "@comet/admin": "8.6.0-canary-20251105084935",
-    "@comet/admin-date-time": "8.6.0-canary-20251105084935",
-    "@comet/admin-icons": "8.6.0-canary-20251105084935",
-    "@comet/admin-rte": "8.6.0-canary-20251105084935"
+    "@comet/admin": "8.6.0-canary-20251105093252",
+    "@comet/admin-date-time": "8.6.0-canary-20251105093252",
+    "@comet/admin-icons": "8.6.0-canary-20251105093252",
+    "@comet/admin-rte": "8.6.0-canary-20251105093252"
   },
   "devDependencies": {
     "@apollo/client": "^3.13.8",
@@ -98,9 +98,9 @@
     "react-router-dom": "^5.3.4",
     "ts-jest": "^29.4.0",
     "typescript": "5.8.3",
-    "@comet/admin-babel-preset": "8.6.0-canary-20251105084935",
-    "@comet/cli": "8.6.0-canary-20251105084935",
-    "@comet/eslint-config": "8.6.0-canary-20251105084935"
+    "@comet/admin-babel-preset": "8.6.0-canary-20251105093252",
+    "@comet/cli": "8.6.0-canary-20251105093252",
+    "@comet/eslint-config": "8.6.0-canary-20251105093252"
   },
   "peerDependencies": {
     "@apollo/client": "^3.7.0",