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.

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

Fix #783 duplicate uploading same asset name #853

Merged
merged 6 commits into from
Dec 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions src/actions/mediaLibrary.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,22 @@ export function persistMedia(file, opts = {}) {
const state = getState();
const backend = currentBackend(state.config);
const integration = selectIntegration(state, null, 'assetStore');
const files = state.mediaLibrary.get('files');
const existingFile = files.find(existingFile => existingFile.name.toLowerCase() === file.name.toLowerCase());

/**
* Check for existing files of the same name before persisting. If no asset
* store integration is used, files are being stored in Git, so we can
* expect file names to be unique. If an asset store is in use, file names
* may not be unique, so we forego this check.
*/
if (!integration && existingFile) {
if (!window.confirm(`${existingFile.name} already exists. Do you want to replace it?`)) {
return;
} else {
await dispatch(deleteMedia(existingFile, { privateUpload }));
}
}

dispatch(mediaPersisting());

Expand Down
12 changes: 6 additions & 6 deletions src/components/MediaLibrary/MediaLibrary.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,21 +112,21 @@ class MediaLibrary extends React.Component {
handlePersist = async event => {
/**
* Stop the browser from automatically handling the file input click, and
* get the file for upload.
* get the file for upload, and retain the synthetic event for access after
* the asynchronous persist operation.
*/
event.stopPropagation();
event.preventDefault();
event.persist();
const { persistMedia, privateUpload } = this.props;
const { files: fileList } = event.dataTransfer || event.target;
const files = [...fileList];
const file = files[0];

/**
* Upload the selected file, then refresh the media library. This should be
* improved in the future, but isn't currently resulting in noticeable
* performance/load time issues.
*/
await persistMedia(file, { privateUpload });

event.target.value = null;

this.scrollToTop();
};

Expand Down