-
-
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 branch '8.3' into bugfix/5085-error-by-delete-assets-still-inuse
- Loading branch information
Showing
84 changed files
with
12,313 additions
and
10,923 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
755 changes: 455 additions & 300 deletions
755
Neos.Media.Browser/Resources/Private/Translations/de/Main.xlf
Large diffs are not rendered by default.
Oops, something went wrong.
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
296 changes: 153 additions & 143 deletions
296
Neos.Media.Browser/Resources/Private/Translations/es/Main.xlf
Large diffs are not rendered by default.
Oops, something went wrong.
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.Helper.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
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 |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| `8.3.14 (2024-06-11) <https://github.com/neos/neos-development-collection/releases/tag/8.3.14>`_ | ||
| ================================================================================================ | ||
|
|
||
| Overview of merged pull requests | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
|
|
||
| `BUGFIX: Prevent multiple imports of the same remote asset in the frontend <https://github.com/neos/neos-development-collection/pull/5117>`_ | ||
| -------------------------------------------------------------------------------------------------------------------------------------------- | ||
|
|
||
| This is a frontend fix for `#5116 <https://github.com/neos/neos-development-collection/issues/5116>`_and prevents users from triggering multiple import processes for the same remote asset. It is not a sufficient fix to only prevent this in the frontend though, since it doesn't catch it, if two or more different users trigger the import for the same asset at the same time. | ||
|
|
||
| Changes: | ||
| - ``select.js``: add data attribute ``data-import-in-process`` to asset once import process has started and remove it when import is done | ||
| - ``select.js``: check for new data attribute and only start import process if attribute does not exist | ||
| - ``select.js``: add notification to inform user that asset is being imported | ||
| - ``select.js``: add notification as warning for user if import is already in process | ||
| - ``Main.xlf``: add new notification messages for english | ||
| - ``Default.html``: add id for notification container to be able to send notifications to it via js | ||
| - ``Configuration.js``: update ``hasConfiguration`` after configuration object was created, because otherwise it will always be false and the translations don't work | ||
|
|
||
| ``related:`` https://github.com/neos/neos-development-collection/issues/5116 | ||
|
|
||
| **Info for testing:** | ||
| You need to bundle the Neos.Neos assets to get the text for the notification messages. | ||
| - navigate to the Neos.Neos package | ||
| - run ``yarn`` | ||
| - run ``yarn build`` | ||
|
|
||
| * Packages: ``Media.Browser`` | ||
|
|
||
| `BUGFIX: Flush cache also for deleted nodes <https://github.com/neos/neos-development-collection/pull/5124>`_ | ||
| ------------------------------------------------------------------------------------------------------------- | ||
|
|
||
| Removed nodes can't get found, so they regarding caches don't get flushed. | ||
|
|
||
| The bug was introduced with `#4291 <https://github.com/neos/neos-development-collection/issues/4291>`_ | ||
| * Fixes: `#5105 <https://github.com/neos/neos-development-collection/issues/5105>`_ | ||
|
|
||
| * Packages: ``Neos`` | ||
|
|
||
| `BUGFIX: Fix title attribute for impersonate button in user management <https://github.com/neos/neos-development-collection/pull/5121>`_ | ||
| ---------------------------------------------------------------------------------------------------------------------------------------- | ||
|
|
||
| With this change the localized text is rendered instead of always defaulting to english. | ||
|
|
||
| Changes: | ||
|
|
||
| - ImpersonateButton.js change postion of const localizedTooltip inside ImpersonateButton function and change isNil(window.Typo3Neos) to isNil(window.NeosCMS) | ||
| - RestoreButton.js it was always fallback text used change isNil(window.NeosCMS) to !isNil(window.NeosCMS) | ||
|
|
||
| * Fixes: `#4511 <https://github.com/neos/neos-development-collection/issues/4511>`_ | ||
|
|
||
| Checklist | ||
|
|
||
| - [ ] Code follows the PSR-2 coding style | ||
| - [ ] Tests have been created, run and adjusted as needed | ||
| - [x] The PR is created against the `lowest maintained branch <https://www.neos.io/features/release-roadmap.html>`_ | ||
| - [x] Reviewer - PR Title is brief but complete and starts with ``FEATURE|TASK|BUGFIX`` | ||
| - [ ] Reviewer - The first section explains the change briefly for change-logs | ||
| - [ ] Reviewer - Breaking Changes are marked with ``!!!`` and have upgrade-instructions | ||
|
|
||
| * Packages: ``Neos`` | ||
|
|
||
| `Detailed log <https://github.com/neos/neos-development-collection/compare/8.3.13...8.3.14>`_ | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
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 |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| `8.3.15 (2024-06-14) <https://github.com/neos/neos-development-collection/releases/tag/8.3.15>`_ | ||
| ================================================================================================ | ||
|
|
||
| Overview of merged pull requests | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
|
|
||
| `BUGFIX: Access isNil function from Helper function to apply selected image to property <https://github.com/neos/neos-development-collection/pull/5140>`_ | ||
| --------------------------------------------------------------------------------------------------------------------------------------------------------- | ||
|
|
||
| **Upgrade instructions** | ||
|
|
||
| _None_ | ||
|
|
||
| **Review instructions** | ||
|
|
||
| Follow-up to: `#5117 <https://github.com/neos/neos-development-collection/issues/5117>`_ | ||
|
|
||
| With the latest Bugfix release of Neos 8.3.14 currently when selecting an image from the media browser it not will be applyied to the image property as the ``IsNil`` function has to be accessed inside of the ``Helper`` function. | ||
|
|
||
| ```javascript | ||
| NeosCMS.isNil() | ||
| ``` | ||
| In this case, leads to an unresolved function or method. | ||
|
|
||
| ### Before | ||
|
|
||
| https://github.com/neos/neos-development-collection/assets/39345336/ed761221-924d-467f-bd9f-6eb6c97dd553 | ||
|
|
||
| ### After | ||
|
|
||
| https://github.com/neos/neos-development-collection/assets/39345336/2c78211a-c8a8-4f55-808a-15b495fde586 | ||
|
|
||
|
|
||
|
|
||
| * Packages: ``Neos`` ``Media.Browser`` | ||
|
|
||
| `Detailed log <https://github.com/neos/neos-development-collection/compare/8.3.14...8.3.15>`_ | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
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
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
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
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
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
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
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
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
Oops, something went wrong.