Skip to content
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

Show UI errors for invalid files in media upload #11061

Merged
merged 3 commits into from
Sep 15, 2021
Merged

Show UI errors for invalid files in media upload #11061

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
e34be20
handle invalid files
madsrasmussen Sep 9, 2021
36ab7ee
show new server error message + add unique key to files
madsrasmussen Sep 13, 2021
ffed382
handle selected and dropped files the same
madsrasmussen Sep 14, 2021
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
30 changes: 19 additions & 11 deletions ...mbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,15 @@ angular.module("umbraco.directives")
function _filesQueued(files, event) {
//Push into the queue
Utilities.forEach(files, file => {
if (_filterFile(file) === true) {

if (_filterFile(file) === true) {

if (file.$error) {
scope.rejected.push(file);
} else {
scope.queue.push(file);
}
if (file.$error) {
scope.rejected.push(file);
} else {
scope.queue.push(file);
}
});
}
});

//when queue is done, kick the uploader
if (!scope.working) {
Expand Down Expand Up @@ -173,6 +172,8 @@ angular.module("umbraco.directives")
}
} else if (evt.Message) {
file.serverErrorMessage = evt.Message;
} else if (evt && typeof evt === 'string') {
file.serverErrorMessage = evt;
}
// If file not found, server will return a 404 and display this message
if (status === 404) {
Expand Down Expand Up @@ -247,11 +248,18 @@ angular.module("umbraco.directives")
return true;// yes, we did open the choose-media dialog, therefor we return true.
}

scope.handleFiles = function(files, event) {
scope.handleFiles = function(files, event, invalidFiles) {
const allFiles = [...files, ...invalidFiles];

// add unique key for each files to use in ng-repeats
allFiles.forEach(file => {
file.key = String.CreateGuid();
});

if (scope.filesQueued) {
scope.filesQueued(files, event);
scope.filesQueued(allFiles, event);
}
_filesQueued(files, event);
_filesQueued(allFiles, event);
};
}
};
Expand Down
10 changes: 5 additions & 5 deletions src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div ngf-drop
ng-hide="hideDropzone === 'true'"
ng-model="filesHolder"
ngf-change="handleFiles($files, $event)"
ngf-change="handleFiles($files, $event, $invalidFiles)"
class="dropzone"
ngf-drag-over-class="'drag-over'"
ngf-multiple="true"
Expand All @@ -30,7 +30,7 @@
class="file-select"
ngf-select
ng-model="filesHolder"
ngf-change="handleFiles($newFiles, $event)"
ngf-change="handleFiles($files, $event, $invalidFiles)"
ngf-multiple="true"
ngf-pattern="{{ accept }}"
ngf-max-size="{{ maxFileSize }}">
Expand All @@ -43,7 +43,7 @@
<ul class="file-list" ng-show="done.length > 0 || queue.length > 0 || rejected.length > 0 || filesHolder.length > 0">

<!-- make list sort order the same as photo grid. The last uploaded photo in the top -->
<li class="file" ng-repeat="file in done">
<li class="file" ng-repeat="file in done track by file.key">

<!-- file name -->
<div class="file-description">{{ file.name }}</div>
Expand All @@ -68,13 +68,13 @@
</li>

<!-- make list sort order the same as photo grid. The last uploaded photo in the top -->
<li class="file" ng-repeat="queued in queue">
<li class="file" ng-repeat="queued in queue track by queued.key">

<!-- file name -->
<div class="file-name">{{queued.name}}</div>
</li>

<li class="file" ng-repeat="file in rejected">
<li class="file" ng-repeat="file in rejected track by file.key">

<!-- file name -->
<div class="file-description">
Expand Down