Skip to content

feat(uploads-manager): add enableModernizedUploads feature flag to ContentUploader #4571

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

Merged
mergify merged 4 commits into from
May 21, 2026
Merged

feat(uploads-manager): add enableModernizedUploads feature flag to ContentUploader #4571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
feae879
feat(uploads-manager): add enableModernizedUploads feature flag to Co…
dealwith May 20, 2026
a2770d3
feat(uploads-manager): add enableModernizedUploads feature flag to Co…
dealwith May 20, 2026
9e8170b
feat(uploads-manager): add UploadManagerBP for tests
dealwith May 21, 2026
55f3e27
fix(i18n): drop en-us auto generated
dealwith May 21, 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)/)',
],
};
105 changes: 63 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,6 +6,7 @@ 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';
Expand Down Expand Up @@ -104,6 +105,7 @@ export interface ContentUploaderProps {
token?: Token;
uploadHost: string;
useUploadsManager?: boolean;
enableModernizedUploads?: boolean;
}

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

/**
Expand Down Expand Up @@ -1268,6 +1271,7 @@ class ContentUploader extends Component<ContentUploaderProps, State> {
render() {
const {
className,
enableModernizedUploads,
fileLimit,
isDraggingItemsToUploadsManager = false,
isFolderUploadEnabled,
Expand All @@ -1294,51 +1298,68 @@ 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={[]} />
</div>
Comment thread
coderabbitai[bot] marked this conversation as resolved.
);
}

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
35 changes: 35 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
@@ -1,9 +1,12 @@
import * as React from 'react';
import { shallow } from 'enzyme';
import { UploadsManager as UploadsManagerBP } from '@box/uploads-manager';
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 {
STATUS_PENDING,
STATUS_IN_PROGRESS,
Expand Down Expand Up @@ -755,4 +758,36 @@ 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(UploadsManagerBP)).toHaveLength(0);
expect(wrapper.find(DroppableContent)).toHaveLength(0);
Comment thread
dealwith marked this conversation as resolved.
});

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);
expect(wrapper.find(UploadsManagerBP)).toHaveLength(0);
});

test('should render modernized UploadsManager when enableModernizedUploads is true', () => {
const wrapper = getWrapper({ enableModernizedUploads: true });
expect(wrapper.find(UploadsManagerBP)).toHaveLength(1);
expect(wrapper.find(UploadsManager)).toHaveLength(0);
Comment thread
dealwith marked this conversation as resolved.
expect(wrapper.find(DroppableContent)).toHaveLength(0);
});

test('should render modernized UploadsManager when enableModernizedUploads is true and useUploadsManager is true', () => {
const wrapper = getWrapper({ enableModernizedUploads: true, useUploadsManager: true });
expect(wrapper.find(UploadsManagerBP)).toHaveLength(1);
expect(wrapper.find(UploadsManager)).toHaveLength(0);
expect(wrapper.find(DroppableContent)).toHaveLength(0);
});
});
});
});
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