box-ui-elements 23.4.0-beta.23 → 23.4.0-beta.24

package/src/api/uploads/BaseUpload.js

@@ -30,7 +30,7 @@ class BaseUpload extends Base {
 
     folderId: string;
 
-    overwrite: boolean;
+    overwrite: boolean | 'error';
 
     conflictCallback: ?(fileName: string) => string;
 
@@ -159,6 +159,10 @@ class BaseUpload extends Base {
             this.errorCallback(errorData);
             // Automatically handle name conflict errors
         } else if (errorData && errorData.status === 409) {
+            if (this.overwrite === 'error') {
+                this.errorCallback(errorData);
+                return;
+            }
             if (this.overwrite) {
                 // Error response contains file ID to upload a new file version for
                 const conflictFileId = errorData.context_info.conflicts.id;

package/src/api/uploads/MultiputUpload.js

@@ -173,6 +173,7 @@ class MultiputUpload extends BaseMultiput {
         errorCallback,
         progressCallback,
         successCallback,
+        // $FlowFixMe
         overwrite = true,
         conflictCallback,
         fileId,
@@ -182,7 +183,7 @@ class MultiputUpload extends BaseMultiput {
         file: File,
         fileId: ?string,
         folderId: string,
-        overwrite?: boolean,
+        overwrite?: boolean | 'error',
         progressCallback?: Function,
         successCallback?: Function,
     }): void {
@@ -217,6 +218,7 @@ class MultiputUpload extends BaseMultiput {
         errorCallback,
         progressCallback,
         successCallback,
+        // $FlowFixMe
         overwrite = true,
         conflictCallback,
         fileId,
@@ -227,7 +229,7 @@ class MultiputUpload extends BaseMultiput {
         fileDescription: ?string,
         fileId: ?string,
         folderId: string,
-        overwrite?: boolean,
+        overwrite?: boolean | 'error',
         progressCallback?: Function,
         successCallback?: Function,
     }): void {
@@ -337,6 +339,10 @@ class MultiputUpload extends BaseMultiput {
             }
 
             if (errorData && errorData.status === 409) {
+                if (this.overwrite === 'error') {
+                    this.errorCallback(errorData);
+                    return;
+                }
                 this.resolveConflict(errorData);
                 this.createSessionRetry();
                 return;
@@ -437,6 +443,7 @@ class MultiputUpload extends BaseMultiput {
         progressCallback,
         sessionId,
         successCallback,
+        // $FlowFixMe
         overwrite = true,
         conflictCallback,
         fileId,
@@ -446,7 +453,7 @@ class MultiputUpload extends BaseMultiput {
         file: File,
         fileId: ?string,
         folderId: string,
-        overwrite?: boolean,
+        overwrite?: boolean | 'error',
         progressCallback?: Function,
         sessionId: string,
         successCallback?: Function,
@@ -598,9 +605,7 @@ class MultiputUpload extends BaseMultiput {
 
             await retryNumOfTimes(
                 (resolve: Function, reject: Function): void => {
-                    this.logEvent(logEventType, logMessage)
-                        .then(resolve)
-                        .catch(reject);
+                    this.logEvent(logEventType, logMessage).then(resolve).catch(reject);
                 },
                 this.config.retries,
                 this.config.initialRetryDelayMs,

package/src/api/uploads/PlainUpload.js

@@ -116,7 +116,7 @@ class PlainUpload extends BaseUpload {
      * @param {Function} [options.errorCallback] - Function to call with errors
      * @param {Function} [options.progressCallback] - Function to call with progress
      * @param {Function} [options.conflictCallback] - Function to call on conflicting file names
-     * @param {boolean} [overwrite] - Should upload overwrite file with same name
+     * @param {boolean|'error'} [overwrite] - Should upload overwrite file with same name, throw error, or call conflictCallback to rename
      * @return {void}
      */
     upload({
@@ -128,6 +128,7 @@ class PlainUpload extends BaseUpload {
         errorCallback = noop,
         progressCallback = noop,
         conflictCallback,
+        // $FlowFixMe
         overwrite = true,
     }: {
         conflictCallback?: Function,
@@ -136,7 +137,7 @@ class PlainUpload extends BaseUpload {
         fileDescription: ?string,
         fileId: ?string,
         folderId: string,
-        overwrite: boolean,
+        overwrite: boolean | 'error',
         progressCallback: Function,
         successCallback: Function,
     }): void {

package/src/api/uploads/__tests__/BaseUpload.test.js

@@ -296,6 +296,20 @@ describe('api/uploads/BaseUpload', () => {
             expect(upload.makePreflightRequest).not.toHaveBeenCalled();
         });
 
+        test('should call error callback on file on 409 if overwrite property is "error"', () => {
+            const error = new Error();
+            error.status = 409;
+            
+            upload.fileId = '123';
+            upload.overwrite = 'error';
+            upload.makePreflightRequest = jest.fn();
+            upload.errorCallback = jest.fn();
+
+            upload.preflightErrorHandler(error, () => {});
+
+            expect(upload.errorCallback).toHaveBeenCalledWith(error);
+        });
+
         test('should overwrite file on 409 if overwrite property is true', () => {
             upload.fileId = '123';
             upload.overwrite = true;

package/src/elements/content-uploader/ContentUploader.tsx

@@ -34,6 +34,7 @@ import {
     CLIENT_NAME_CONTENT_UPLOADER,
     DEFAULT_HOSTNAME_API,
     DEFAULT_HOSTNAME_UPLOAD,
+    ERROR_CODE_ITEM_NAME_IN_USE,
     ERROR_CODE_UPLOAD_FILE_LIMIT,
     STATUS_COMPLETE,
     STATUS_ERROR,
@@ -90,7 +91,7 @@ export interface ContentUploaderProps {
     onResume: (item: UploadItem) => void;
     onUpgradeCTAClick?: () => void;
     onUpload: (item?: UploadItem | BoxItem) => void;
-    overwrite: boolean;
+    overwrite: boolean | 'error';
     requestInterceptor?: (response: AxiosResponse) => void;
     responseInterceptor?: (config: AxiosRequestConfig) => void;
     rootFolderId: string;
@@ -1083,7 +1084,7 @@ class ContentUploader extends Component<ContentUploaderProps, State> {
      */
     onClick = (item: UploadItem) => {
         const { chunked, isResumableUploadsEnabled, onClickCancel, onClickResume, onClickRetry } = this.props;
-        const { file, status } = item;
+        const { file, status, error } = item;
         const isChunkedUpload =
             chunked && !item.isFolder && file.size > CHUNKED_UPLOAD_MIN_SIZE_BYTES && isMultiputSupported();
         const isResumable = isResumableUploadsEnabled && isChunkedUpload && item.api.sessionId;
@@ -1097,7 +1098,10 @@ class ContentUploader extends Component<ContentUploaderProps, State> {
                 onClickCancel(item);
                 break;
             case STATUS_ERROR:
-                if (isResumable) {
+                if (error?.code === ERROR_CODE_ITEM_NAME_IN_USE) {
+                    this.removeFileFromUploadQueue(item);
+                    onClickCancel(item);
+                } else if (isResumable) {
                     item.bytesUploadedOnLastResume = item.api.totalUploadedBytes;
                     this.resumeFile(item);
                     onClickResume(item);

package/src/elements/content-uploader/ItemAction.tsx

@@ -8,6 +8,7 @@ import { Size5, SurfaceStatusSurfaceSuccess } from '@box/blueprint-web-assets/to
 import IconInProgress from './IconInProgress';
 
 import {
+    ERROR_CODE_ITEM_NAME_IN_USE,
     ERROR_CODE_UPLOAD_FILE_SIZE_LIMIT_EXCEEDED,
     STATUS_COMPLETE,
     STATUS_ERROR,
@@ -70,8 +71,13 @@ const ItemAction = ({
             }
             break;
         case STATUS_ERROR:
-            Icon = ArrowCurveForward;
-            tooltip = isResumableUploadsEnabled ? messages.resume : messages.retry;
+            if (code === ERROR_CODE_ITEM_NAME_IN_USE) {
+                Icon = XMark;
+                tooltip = messages.uploadsCancelButtonTooltip;
+            } else {
+                Icon = ArrowCurveForward;
+                tooltip = isResumableUploadsEnabled ? messages.resume : messages.retry;
+            }
             break;
         case STATUS_IN_PROGRESS:
         case STATUS_STAGED: