Skip to content

Add chunked file upload support to asset manager PRESIDECMS-3260 #1760

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

Open
alexskinner wants to merge 3 commits into
base: stable
Choose a base branch
from
Open

Add chunked file upload support to asset manager PRESIDECMS-3260 #1760

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
076c5e1
Add chunked file upload support to asset manager
Apr 11, 2026
fc527ba
Address PR review feedback for chunked file upload
alexskinner Apr 16, 2026
45fa150
Move UUID validation to ChunkedUploadService.isValidUUID()
alexskinner Apr 16, 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
482 changes: 482 additions & 0 deletions system/assets/js/admin/specific/assetmanager/chunkedUpload/chunkedUploadInterface.js
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions system/config/Config.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,10 +856,11 @@ component {
settings.uploads_directory = ExpandPath( "/uploads" );
settings.storageProviders = { filesystem = { class="preside.system.services.fileStorage.fileSystemStorageProvider" } };
settings.assetManager = {
maxFileSize = "5"
, derivativeLimits = { maxHeight=0, maxWidth=0, maxResolution=0, tooBigPlaceholder="/preside/system/assets/images/placeholders/largeimage.jpg" }
, types = _getConfiguredFileTypes()
, derivatives = _getConfiguredAssetDerivatives()
maxFileSize = "5"
, chunkingThreshold = "10"
, derivativeLimits = { maxHeight=0, maxWidth=0, maxResolution=0, tooBigPlaceholder="/preside/system/assets/images/placeholders/largeimage.jpg" }
, types = _getConfiguredFileTypes()
, derivatives = _getConfiguredAssetDerivatives()
, datatable = { paginationOptions=[ 5, 10, 25, 50, 100 ], defaultPageLength=10 }
, queue = { concurrency=1, batchSize=100, downloadWaitSeconds=5 }
, folders = {}
Expand Down
127 changes: 110 additions & 17 deletions system/handlers/admin/AssetManager.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,21 +641,41 @@ component extends="preside.system.base.AdminHandler" {
function uploadAssets( event, rc, prc ) {
_checkPermissions( argumentCollection=arguments, key="assets.upload" );

var folderId = rc.folder ?: "";
var folder = prc.folder ?: queryNew("");
if( folder.recordCount ){
var maxFileSize = folder.max_filesize_in_mb ?: 100;
var allowedTypes = folder.allowed_filetypes ?: "";
var extensionList = "";

assetManagerService.expandTypeList( ListToArray( allowedTypes ) ).each( function( type ){
extensionList = ListAppend( extensionList, ".#type#" );
} );
var folderId = rc.folder ?: "";
var folder = prc.folder ?: queryNew("");
var assetManagerSettings = getSetting( name="assetManager" );
var maxFileSize = Val( assetManagerSettings.maxFileSize ?: 100 );
var chunkingThreshold = Val( assetManagerSettings.chunkingThreshold ?: 10 );
var allowedTypes = "";
var extensionList = "";

if ( folder.recordCount ) {
if ( Val( folder.max_filesize_in_mb ?: 0 ) ) {
maxFileSize = Val( folder.max_filesize_in_mb );
}
if ( Len( Trim( folder.allowed_filetypes ?: "" ) ) ) {
allowedTypes = folder.allowed_filetypes;
extensionList = "";
assetManagerService.expandTypeList( ListToArray( allowedTypes ) ).each( function( type ){
extensionList = ListAppend( extensionList, ".#type#" );
} );
}
}

event.includeData( { allowedExtensions = extensionList, maxFileSize = maxFileSize } );
if ( extensionList == "" ) {
extensionList = _buildSystemExtensionList();
}

prc.pageIcon = "picture";
event.includeData( {
allowedExtensions = extensionList
, maxFileSize = maxFileSize
, chunkingThreshold = chunkingThreshold
, chunkedUploadChunkUrl = event.buildAdminLink( linkto="chunkedUpload.uploadChunk" )
, chunkedUploadFinalizeUrl = event.buildAdminLink( linkto="chunkedUpload.finalize" )
, getUploadRestrictionsUrl = event.buildAdminLink( linkto="assetmanager.getUploadRestrictions" )
} );

prc.pageIcon = "picture-o";
prc.pageTitle = translateResource( "cms:assetManager" );
prc.pageSubTitle = translateResource( "cms:assetmanager.upload.assets.title" );

Expand All @@ -665,6 +685,51 @@ component extends="preside.system.base.AdminHandler" {
);
}

/**
* Returns upload restrictions (maxFileSize, allowedExtensions) for a given folder.
* Called via AJAX when the folder selection changes on the upload form so that
* queued files can be re-validated against the new folder's restrictions.
*/
function getUploadRestrictions( event, rc, prc ) {
_checkPermissions( argumentCollection=arguments, key="assets.upload" );

var folderId = rc.folder ?: "";
var assetManagerSettings = getSetting( name="assetManager" );
var systemMaxFileSize = Val( assetManagerSettings.maxFileSize ?: 100 );
var chunkingThreshold = Val( assetManagerSettings.chunkingThreshold ?: 10 );
var maxFileSize = systemMaxFileSize;
var extensionList = "";

if ( Len( Trim( folderId ) ) ) {
var folder = assetManagerService.getFolder( id=folderId );
if ( folder.recordCount ) {
// maxFileSize: use folder-specific limit only if explicitly set
if ( Val( folder.max_filesize_in_mb ?: 0 ) ) {
maxFileSize = Val( folder.max_filesize_in_mb );
}

// allowedExtensions: use the same logic as uploadAssets to guarantee
// the extension list format is identical between page load and AJAX recheck
if ( Len( Trim( folder.allowed_filetypes ?: "" ) ) ) {
extensionList = "";
assetManagerService.expandTypeList( ListToArray( folder.allowed_filetypes ) ).each( function( type ){
extensionList = ListAppend( extensionList, ".#type#" );
} );
}
}
}

if ( extensionList == "" ) {
extensionList = _buildSystemExtensionList();
}

event.renderData( type="json", data={
maxFileSize = maxFileSize
, allowedExtensions = extensionList
, chunkingThreshold = chunkingThreshold
} );
}

function uploadAssetAction( event, rc, prc ) {
_checkPermissions( argumentCollection=arguments, key="assets.upload" );
rc.file = runEvent(
Expand Down Expand Up @@ -1074,18 +1139,33 @@ component extends="preside.system.base.AdminHandler" {
function assetPickerUploader( event, rc, prc ) {
_checkPermissions( argumentCollection=arguments, key="assets.upload" );

var multiple = rc.multiple ?: "";
var allowedTypes = rc.allowedTypes ?: "";
var maxFileSize = rc.maxFileSize ?: "";
var multiple = rc.multiple ?: "";
var allowedTypes = rc.allowedTypes ?: "";
var assetManagerSettings = getSetting( name="assetManager" );
var maxFileSize = Val( rc.maxFileSize ?: "" ) > 0 ? Val( rc.maxFileSize ) : Val( assetManagerSettings.maxFileSize ?: 100 );
var chunkingThreshold = Val( assetManagerSettings.chunkingThreshold ?: 10 );
var extensionList = "";

if ( Len( Trim( allowedTypes ) ) ) {
var extensionList = "";
extensionList = "";
assetManagerService.expandTypeList( ListToArray( allowedTypes ) ).each( function( type ){
extensionList = ListAppend( extensionList, ".#type#" );
} );
event.includeData( { allowedExtensions = extensionList, maxFileSize = maxFileSize } );
}

if ( extensionList == "" ) {
extensionList = _buildSystemExtensionList();
}

event.includeData( {
allowedExtensions = extensionList
, maxFileSize = maxFileSize
, chunkingThreshold = chunkingThreshold
, chunkedUploadChunkUrl = event.buildAdminLink( linkto="chunkedUpload.uploadChunk" )
, chunkedUploadFinalizeUrl = event.buildAdminLink( linkto="chunkedUpload.finalize" )
, getUploadRestrictionsUrl = event.buildAdminLink( linkto="assetmanager.getUploadRestrictions" )
} );

if ( !IsBoolean( multiple ) || !multiple ) {
event.includeData( { maxFiles = 1 } );
}
Expand Down Expand Up @@ -1535,6 +1615,19 @@ component extends="preside.system.base.AdminHandler" {
}

// PRIVATE HELPERS
private string function _buildSystemExtensionList() {
var extensionList = "";
var allTypeGroups = StructKeyList( getSetting( name="assetManager" ).types ?: {} );

if ( Len( Trim( allTypeGroups ) ) ) {
assetManagerService.expandTypeList( ListToArray( allTypeGroups ) ).each( function( ext ){
extensionList = ListAppend( extensionList, ".#ext#" );
} );
}

return extensionList;
}

private void function _checkPermissions( event, rc, prc, required string key ) {
var permitted = "";
var permKey = "assetmanager." & arguments.key;
Expand Down
Loading
Loading