Skip to content

feat(uploads-manager): integrate shared feature into ContentUploader #4573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dealwith wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

feat(uploads-manager): integrate shared feature into ContentUploader #4573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9d6a63
feat(uploads-manager): add enableModernizedUploads feature flag to Co…
dealwith May 20, 2026
e7246f1
feat(uploads-manager): add enableModernizedUploads feature flag to Co…
dealwith May 20, 2026
b7bf9cc
feat(uploads-manager): integrate shared feature into ContentUploader
dealwith May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/jest/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ module.exports = {
testMatch: ['**/__tests__/**/*.test.+(js|jsx|ts|tsx)'],
testPathIgnorePatterns: ['stories.test.js$', 'stories.test.tsx$', 'stories.test.d.ts'],
transformIgnorePatterns: [
'node_modules/(?!(@box/activity-feed|@box/collaboration-popover|@box/react-virtualized/dist/es|@box/cldr-data|@box/blueprint-web|@box/blueprint-web-assets|@box/metadata-editor|@box/box-ai-content-answers|@box/box-ai-agent-selector|@box/item-icon|@box/combobox-with-api|@box/tree|@box/metadata-filter|@box/metadata-view|@box/content-field|@box/types|@box/box-item-type-selector|@box/unified-share-modal|@box/user-selector|@box/copy-input|@box/readable-time|@box/threaded-annotations)/)',
'node_modules/(?!(@box/activity-feed|@box/collaboration-popover|@box/react-virtualized/dist/es|@box/cldr-data|@box/blueprint-web|@box/blueprint-web-assets|@box/metadata-editor|@box/box-ai-content-answers|@box/box-ai-agent-selector|@box/item-icon|@box/combobox-with-api|@box/tree|@box/metadata-filter|@box/metadata-view|@box/content-field|@box/types|@box/box-item-type-selector|@box/unified-share-modal|@box/user-selector|@box/copy-input|@box/readable-time|@box/threaded-annotations|@box/uploads-manager)/)',
],
};
136 changes: 94 additions & 42 deletions src/elements/content-uploader/ContentUploader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ import flow from 'lodash/flow';
import getProp from 'lodash/get';
import noop from 'lodash/noop';
import uniqueid from 'lodash/uniqueId';
import { UploadsManager as UploadsManagerBP } from '@box/uploads-manager';
import { TooltipProvider } from '@box/blueprint-web';
import { AxiosRequestConfig, AxiosResponse } from 'axios';
import DroppableContent from './DroppableContent';
import Footer from './Footer';
import UploadsManager from './UploadsManager';
import { mapToModernizedUploadItems } from './utils/mapToModernizedUploadItem';
import API from '../../api';
import Browser from '../../utils/Browser';
import Internationalize from '../common/Internationalize';
Expand Down Expand Up @@ -104,6 +106,7 @@ export interface ContentUploaderProps {
token?: Token;
uploadHost: string;
useUploadsManager?: boolean;
enableModernizedUploads?: boolean;
}

type State = {
Expand Down Expand Up @@ -169,6 +172,7 @@ class ContentUploader extends Component<ContentUploaderProps, State> {
rootFolderId: DEFAULT_ROOT,
uploadHost: DEFAULT_HOSTNAME_UPLOAD,
useUploadsManager: false,
enableModernizedUploads: false,
};

/**
Expand Down Expand Up @@ -1216,6 +1220,28 @@ class ContentUploader extends Component<ContentUploaderProps, State> {
}
};

/**
* Find legacy UploadItem by the id used by the modernized uploads manager.
*/
findItemByModernizedId = (id: string): UploadItem | undefined => {
const { rootFolderId } = this.props;
return this.state.items.find(item => getFileId(item.file, rootFolderId) === id);
};

handleModernizedItemAction = (id: string) => {
const item = this.findItemByModernizedId(id);
if (item) {
this.onClick(item);
}
};

handleModernizedItemRemove = (id: string) => {
const item = this.findItemByModernizedId(id);
if (item) {
this.removeFileFromUploadQueue(item);
}
};

/**
* Empties the items queue
*
Expand Down Expand Up @@ -1268,6 +1294,7 @@ class ContentUploader extends Component<ContentUploaderProps, State> {
render() {
const {
className,
enableModernizedUploads,
fileLimit,
isDraggingItemsToUploadsManager = false,
isFolderUploadEnabled,
Expand All @@ -1278,6 +1305,7 @@ class ContentUploader extends Component<ContentUploaderProps, State> {
messages,
onClose,
onUpgradeCTAClick,
rootFolderId,
theme,
useUploadsManager,
}: ContentUploaderProps = this.props;
Expand All @@ -1294,51 +1322,75 @@ class ContentUploader extends Component<ContentUploaderProps, State> {
be: !useUploadsManager,
});

const renderUploader = () => {
if (enableModernizedUploads) {
return (
<div ref={measureRef} className={styleClassName} id={this.id}>
<ThemingStyles selector={`#${this.id}`} theme={theme} />
<UploadsManagerBP
items={mapToModernizedUploadItems(items, rootFolderId)}
isExpanded={isUploadsManagerExpanded}
onToggle={this.toggleUploadsManager}
onItemCancel={this.handleModernizedItemAction}
onItemRetry={this.handleModernizedItemAction}
onItemRemove={this.handleModernizedItemRemove}
/>
</div>
);
}

if (useUploadsManager) {
return (
<div ref={measureRef} className={styleClassName} id={this.id}>
<ThemingStyles selector={`#${this.id}`} theme={theme} />
<UploadsManager
isDragging={isDraggingItemsToUploadsManager}
isExpanded={isUploadsManagerExpanded}
isResumableUploadsEnabled={isResumableUploadsEnabled}
isVisible={isVisible}
items={items}
onItemActionClick={this.onClick}
onRemoveActionClick={this.removeFileFromUploadQueue}
onUpgradeCTAClick={onUpgradeCTAClick}
onUploadsManagerActionClick={this.clickAllWithStatus}
toggleUploadsManager={this.toggleUploadsManager}
view={view}
/>
</div>
)
}

return (
<div ref={measureRef} className={styleClassName} id={this.id}>
<ThemingStyles selector={`#${this.id}`} theme={theme} />
<DroppableContent
addDataTransferItemsToUploadQueue={this.addDroppedItemsToUploadQueue}
addFiles={this.addFilesToUploadQueue}
allowedTypes={['Files']}
isFolderUploadEnabled={isFolderUploadEnabled}
isTouch={isTouch}
items={items}
onClick={this.onClick}
view={view}
/>
<Footer
errorCode={errorCode}
fileLimit={fileLimit}
hasFiles={hasFiles}
isLoading={isLoading}
onCancel={this.cancel}
onClose={onClose}
onUpload={this.upload}
isDone={isDone}
/>
</div>
)
}

return (
<Internationalize language={language} messages={messages}>
<TooltipProvider>
{useUploadsManager ? (
<div ref={measureRef} className={styleClassName} id={this.id}>
<ThemingStyles selector={`#${this.id}`} theme={theme} />
<UploadsManager
isDragging={isDraggingItemsToUploadsManager}
isExpanded={isUploadsManagerExpanded}
isResumableUploadsEnabled={isResumableUploadsEnabled}
isVisible={isVisible}
items={items}
onItemActionClick={this.onClick}
onRemoveActionClick={this.removeFileFromUploadQueue}
onUpgradeCTAClick={onUpgradeCTAClick}
onUploadsManagerActionClick={this.clickAllWithStatus}
toggleUploadsManager={this.toggleUploadsManager}
view={view}
/>
</div>
) : (
<div ref={measureRef} className={styleClassName} id={this.id}>
<ThemingStyles selector={`#${this.id}`} theme={theme} />
<DroppableContent
addDataTransferItemsToUploadQueue={this.addDroppedItemsToUploadQueue}
addFiles={this.addFilesToUploadQueue}
allowedTypes={['Files']}
isFolderUploadEnabled={isFolderUploadEnabled}
isTouch={isTouch}
items={items}
onClick={this.onClick}
view={view}
/>
<Footer
errorCode={errorCode}
fileLimit={fileLimit}
hasFiles={hasFiles}
isLoading={isLoading}
onCancel={this.cancel}
onClose={onClose}
onUpload={this.upload}
isDone={isDone}
/>
</div>
)}
{renderUploader()}
</TooltipProvider>
</Internationalize>
);
Expand Down
108 changes: 108 additions & 0 deletions src/elements/content-uploader/__tests__/ContentUploader.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import * as UploaderUtils from '../../../utils/uploads';
import Browser from '../../../utils/Browser';
import { ContentUploaderComponent, CHUNKED_UPLOAD_MIN_SIZE_BYTES } from '../ContentUploader';
import Footer from '../Footer';
import UploadsManager from '../UploadsManager';
import DroppableContent from '../DroppableContent';
import { UploadsManager as UploadsManagerBP } from '@box/uploads-manager';
import {
STATUS_PENDING,
STATUS_IN_PROGRESS,
Expand Down Expand Up @@ -755,4 +758,109 @@ describe('elements/content-uploader/ContentUploader', () => {
expect(instance.addToQueue.mock.calls[0][0].length).toBe(mockFoldersList.length);
});
});

describe('render()', () => {
describe('enableModernizedUploads', () => {
test('should render legacy UploadsManager when enableModernizedUploads is false and useUploadsManager is true', () => {
const wrapper = getWrapper({ enableModernizedUploads: false, useUploadsManager: true });
expect(wrapper.find(UploadsManager)).toHaveLength(1);
expect(wrapper.find(DroppableContent)).toHaveLength(0);
});

test('should render DroppableContent when enableModernizedUploads is false and useUploadsManager is false', () => {
const wrapper = getWrapper({ enableModernizedUploads: false, useUploadsManager: false });
expect(wrapper.find(DroppableContent)).toHaveLength(1);
expect(wrapper.find(UploadsManager)).toHaveLength(0);
});

test('should render modernized UploadsManagerBP when enableModernizedUploads is true', () => {
const wrapper = getWrapper({ enableModernizedUploads: true });
expect(wrapper.find(UploadsManagerBP)).toHaveLength(1);
expect(wrapper.find(UploadsManager)).toHaveLength(0);
expect(wrapper.find(DroppableContent)).toHaveLength(0);
});

test('should render modernized UploadsManagerBP even when useUploadsManager is true', () => {
const wrapper = getWrapper({ enableModernizedUploads: true, useUploadsManager: true });
expect(wrapper.find(UploadsManagerBP)).toHaveLength(1);
expect(wrapper.find(UploadsManager)).toHaveLength(0);
});

test('should map state.items to modernized item shape', () => {
const wrapper = getWrapper({ enableModernizedUploads: true });
wrapper.setState({
items: [
{
name: 'foo.pdf',
extension: 'pdf',
progress: 42,
status: STATUS_IN_PROGRESS,
file: { name: 'foo.pdf' },
},
],
});
const items = wrapper.find(UploadsManagerBP).prop('items');
expect(items).toHaveLength(1);
expect(items[0]).toMatchObject({
name: 'foo.pdf',
extension: 'pdf',
progress: 42,
status: 'uploading',
});
});

test('should pass isExpanded from state', () => {
const wrapper = getWrapper({ enableModernizedUploads: true });
wrapper.setState({ isUploadsManagerExpanded: true });
expect(wrapper.find(UploadsManagerBP).prop('isExpanded')).toBe(true);
});

test('should call onClick when onItemCancel is invoked', () => {
const wrapper = getWrapper({ enableModernizedUploads: true });
const item = {
name: 'foo.pdf',
extension: 'pdf',
progress: 0,
status: STATUS_PENDING,
file: { name: 'foo.pdf' },
};
wrapper.setState({ items: [item] });
const instance = wrapper.instance();
const onClickSpy = jest.spyOn(instance, 'onClick').mockImplementation(() => {});

wrapper.find(UploadsManagerBP).prop('onItemCancel')('foo.pdf');

expect(onClickSpy).toHaveBeenCalledWith(item);
});

test('should call removeFileFromUploadQueue when onItemRemove is invoked', () => {
const wrapper = getWrapper({ enableModernizedUploads: true });
const item = {
name: 'foo.pdf',
extension: 'pdf',
progress: 0,
status: STATUS_COMPLETE,
file: { name: 'foo.pdf' },
};
wrapper.setState({ items: [item] });
const instance = wrapper.instance();
const removeSpy = jest.spyOn(instance, 'removeFileFromUploadQueue').mockImplementation(() => {});

wrapper.find(UploadsManagerBP).prop('onItemRemove')('foo.pdf');

expect(removeSpy).toHaveBeenCalledWith(item);
});

test('should no-op when modernized id does not match any item', () => {
const wrapper = getWrapper({ enableModernizedUploads: true });
wrapper.setState({ items: [] });
const instance = wrapper.instance();
const onClickSpy = jest.spyOn(instance, 'onClick').mockImplementation(() => {});

wrapper.find(UploadsManagerBP).prop('onItemCancel')('missing-id');

expect(onClickSpy).not.toHaveBeenCalled();
});
});
});
});
6 changes: 6 additions & 0 deletions src/elements/content-uploader/stories/ContentUploader.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ export const withTheming = {
},
};

export const withModernizedUploads = {
args: {
enableModernizedUploads: true,
},
};

export default {
title: 'Elements/ContentUploader',
component: ContentUploader,
Expand Down
Loading
Loading