Skip to content

V15: Improve the dropzone for Upload Field #18840

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
iOvergaard merged 5 commits into from
Mar 27, 2025
Merged

V15: Improve the dropzone for Upload Field #18840

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8876cc3
feat: maps up the CANCELLED status
iOvergaard Mar 27, 2025
75eb1ae
feat: uses the new dropzone input to render the dropzone
iOvergaard Mar 27, 2025
136f218
feat: adds support for differing server urls
iOvergaard Mar 27, 2025
af1d52d
chore: avoids a breaking change by storing the temporary file
iOvergaard Mar 27, 2025
17609cf
Import type ordering
leekelleher Mar 27, 2025
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
12 changes: 5 additions & 7 deletions src/Umbraco.Web.UI.Client/src/packages/media/dropzone/dropzone-manager.class.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ export class UmbDropzoneManager extends UmbControllerBase {
}

/**
* @param isAllowed
* @deprecated Not used anymore; this method will be removed in Umbraco 17.
*/
public setIsFoldersAllowed(isAllowed: boolean) {
Expand Down Expand Up @@ -128,7 +127,9 @@ export class UmbDropzoneManager extends UmbControllerBase {
const uploaded = await this.#tempFileManager.uploadOne(item.temporaryFile);

// Update progress
if (uploaded.status === TemporaryFileStatus.SUCCESS) {
if (uploaded.status === TemporaryFileStatus.CANCELLED) {
this.#updateStatus(item, UmbFileDropzoneItemStatus.CANCELLED);
} else if (uploaded.status === TemporaryFileStatus.SUCCESS) {
this.#updateStatus(item, UmbFileDropzoneItemStatus.COMPLETE);
} else {
this.#updateStatus(item, UmbFileDropzoneItemStatus.ERROR);
Expand Down Expand Up @@ -226,7 +227,8 @@ export class UmbDropzoneManager extends UmbControllerBase {

async #handleFile(item: UmbUploadableFile, mediaTypeUnique: string) {
// Upload the file as a temporary file and update progress.
const temporaryFile = await this.#uploadAsTemporaryFile(item);
const temporaryFile = await this.#tempFileManager.uploadOne(item.temporaryFile);

if (temporaryFile.status === TemporaryFileStatus.CANCELLED) {
this.#updateStatus(item, UmbFileDropzoneItemStatus.CANCELLED);
return;
Expand Down Expand Up @@ -257,10 +259,6 @@ export class UmbDropzoneManager extends UmbControllerBase {
}
}

#uploadAsTemporaryFile(item: UmbUploadableFile) {
return this.#tempFileManager.uploadOne(item.temporaryFile);
}

// Media types
async #getMediaTypeOptions(item: UmbUploadableItem): Promise<Array<UmbAllowedMediaTypeModel>> {
// Check the parent which children media types are allowed
Expand Down
Loading
Loading