-
-
Notifications
You must be signed in to change notification settings - Fork 224
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5117 from queoGmbH/bugfix/prevent-multiple-import…
…s-of-same-asset BUGFIX: Prevent multiple imports of the same remote asset in the frontend
- Loading branch information
Showing
4 changed files
with
92 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 83 additions & 31 deletions
114
Neos.Media.Browser/Resources/Public/JavaScript/select.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,84 @@ | ||
| window.addEventListener('DOMContentLoaded', (event) => { | ||
| $(function() { | ||
| if (window.parent !== window && window.parent.NeosMediaBrowserCallbacks) { | ||
| // we are inside iframe | ||
| $('.asset-list').on('click', '[data-asset-identifier]', function(e) { | ||
| if ( | ||
| $(e.target).closest('a, button').not('[data-asset-identifier]').length === 0 && | ||
| window.parent.NeosMediaBrowserCallbacks && | ||
| typeof window.parent.NeosMediaBrowserCallbacks.assetChosen === 'function' | ||
| ) { | ||
| let localAssetIdentifier = $(this).attr('data-local-asset-identifier'); | ||
| if (localAssetIdentifier !== '') { | ||
| window.parent.NeosMediaBrowserCallbacks.assetChosen(localAssetIdentifier); | ||
| } else { | ||
| $.post( | ||
| $('link[rel="neos-media-browser-service-assetproxies-import"]').attr('href'), | ||
| { | ||
| assetSourceIdentifier: $(this).attr('data-asset-source-identifier'), | ||
| assetIdentifier: $(this).attr('data-asset-identifier'), | ||
| __csrfToken: $('body').attr('data-csrf-token') | ||
| }, | ||
| function(data) { | ||
| window.parent.NeosMediaBrowserCallbacks.assetChosen(data.localAssetIdentifier); | ||
| } | ||
| ); | ||
| } | ||
| e.preventDefault(); | ||
| } | ||
| }); | ||
| } | ||
| }); | ||
| window.addEventListener('DOMContentLoaded', () => { | ||
| (function () { | ||
| const NeosMediaBrowserCallbacks = window.parent.NeosMediaBrowserCallbacks; | ||
| const NeosCMS = window.NeosCMS; | ||
|
|
||
| if (window.parent === window || !NeosCMS || !NeosMediaBrowserCallbacks || typeof NeosMediaBrowserCallbacks.assetChosen !== 'function') { | ||
| return; | ||
| } | ||
|
|
||
| function importAsset(asset) { | ||
| const params = new URLSearchParams(); | ||
| params.append('assetSourceIdentifier', asset.dataset.assetSourceIdentifier); | ||
| params.append('assetIdentifier', asset.dataset.assetIdentifier); | ||
| params.append('__csrfToken', document.querySelector('body').dataset.csrfToken); | ||
|
|
||
| fetch( | ||
| document | ||
| .querySelector('link[rel="neos-media-browser-service-assetproxies-import"]') | ||
| .getAttribute('href'), | ||
| { | ||
| headers: { | ||
| 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', | ||
| }, | ||
| method: 'POST', | ||
| credentials: 'include', | ||
| body: params.toString(), | ||
| } | ||
| ) | ||
| .then((response) => { | ||
| if (!response.ok) { | ||
| throw new Error(`HTTP error! status: ${response.status}`); | ||
| } | ||
| return response.json(); | ||
| }) | ||
| .then((data) => { | ||
| NeosMediaBrowserCallbacks.assetChosen(data.localAssetIdentifier); | ||
| asset.removeAttribute('data-import-in-process'); | ||
| }) | ||
| .catch((error) => { | ||
| NeosCMS.Notification.error(NeosCMS.I18n.translate( | ||
| 'assetImport.importError', | ||
| 'Asset could not be imported. Please try again.', | ||
| 'Neos.Media.Browser' | ||
| ), error); | ||
| console.error('Error:', error); | ||
| }) | ||
| } | ||
|
|
||
| const assets = document.querySelectorAll('[data-asset-identifier]'); | ||
| assets.forEach((asset) => { | ||
| asset.addEventListener('click', (e) => { | ||
| const assetLink = e.target.closest('a[data-asset-identifier], button[data-asset-identifier]'); | ||
| if (!assetLink) { | ||
| return; | ||
| } | ||
|
|
||
| const localAssetIdentifier = asset.dataset.localAssetIdentifier; | ||
| if (localAssetIdentifier !== '' && !NeosCMS.isNil(localAssetIdentifier)) { | ||
| NeosMediaBrowserCallbacks.assetChosen(localAssetIdentifier); | ||
| } else { | ||
| if (asset.dataset.importInProcess !== 'true') { | ||
| asset.dataset.importInProcess = 'true'; | ||
| const message = NeosCMS.I18n.translate( | ||
| 'assetImport.importInfo', | ||
| 'Asset is being imported. Please wait.', | ||
| 'Neos.Media.Browser' | ||
| ); | ||
| NeosCMS.Notification.ok(message); | ||
|
|
||
| importAsset(asset); | ||
| } else { | ||
| const message = NeosCMS.I18n.translate( | ||
| 'assetImport.importInProcess', | ||
| 'Import still in process. Please wait.', | ||
| 'Neos.Media.Browser' | ||
| ); | ||
| NeosCMS.Notification.warning(message); | ||
| } | ||
| } | ||
| e.preventDefault(); | ||
| }); | ||
| }); | ||
| })(); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters