diff --git a/.github/workflows/add-pr-labels.yml b/.github/workflows/add-pr-labels.yml index 1c492a3dd09..68add971b34 100644 --- a/.github/workflows/add-pr-labels.yml +++ b/.github/workflows/add-pr-labels.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Maybe remove base branch label diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4da0d3a9579..7ab68071717 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,7 +83,7 @@ jobs: working-directory: . - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: ${{ env.NEOS_FOLDER }} @@ -96,7 +96,7 @@ jobs: ini-values: date.timezone="Africa/Tunis", opcache.fast_shutdown=0, apc.enable_cli=on - name: Checkout development distribution - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: neos/neos-development-distribution ref: ${{ env.NEOS_TARGET_VERSION }} @@ -113,7 +113,7 @@ jobs: - name: Cache Composer packages id: composer-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.cache/composer diff --git a/.github/workflows/doctum.yml b/.github/workflows/doctum.yml index eef9ac3bf07..c972fbdb930 100644 --- a/.github/workflows/doctum.yml +++ b/.github/workflows/doctum.yml @@ -9,7 +9,7 @@ jobs: build-api-docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build API documentation uses: sudo-bot/action-doctum@v5 @@ -20,7 +20,7 @@ jobs: cli-args: "--output-format=github --no-ansi --no-progress --ignore-parse-errors --only-version=${{ github.ref_name }}" - name: Check out documentation site - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: neos/neos.github.io path: docs-site diff --git a/.github/workflows/postgresql-versions.yml b/.github/workflows/postgresql-versions.yml index 9e0a6a27eea..acc58643831 100644 --- a/.github/workflows/postgresql-versions.yml +++ b/.github/workflows/postgresql-versions.yml @@ -67,7 +67,7 @@ jobs: working-directory: . - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: ${{ env.NEOS_FOLDER }} @@ -80,7 +80,7 @@ jobs: ini-values: date.timezone="Africa/Tunis", opcache.fast_shutdown=0, apc.enable_cli=on - name: Checkout development distribution - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: neos/neos-development-distribution ref: ${{ env.NEOS_TARGET_VERSION }} @@ -102,7 +102,7 @@ jobs: - name: Cache Composer packages id: composer-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.cache/composer diff --git a/Neos.ContentRepository/Classes/Domain/Model/Node.php b/Neos.ContentRepository/Classes/Domain/Model/Node.php index 13909e0aebd..6f6b0df8882 100644 --- a/Neos.ContentRepository/Classes/Domain/Model/Node.php +++ b/Neos.ContentRepository/Classes/Domain/Model/Node.php @@ -1743,6 +1743,10 @@ protected function createRecursiveCopy(NodeInterface $referenceNode, string $nod } /** @var $childNode Node */ foreach ($this->getChildNodes() as $childNode) { + // Don't copy removed nodes + if ($childNode->isRemoved()) { + continue; + } // Prevent recursive copy when copying into itself if ($childNode->getIdentifier() !== $copiedNode->getIdentifier()) { $childNode->copyIntoInternal($copiedNode, $childNode->getName(), $detachedCopy); diff --git a/Neos.ContentRepository/Classes/Domain/Model/NodeData.php b/Neos.ContentRepository/Classes/Domain/Model/NodeData.php index ca5d7d581e2..c80d2c816e1 100644 --- a/Neos.ContentRepository/Classes/Domain/Model/NodeData.php +++ b/Neos.ContentRepository/Classes/Domain/Model/NodeData.php @@ -771,6 +771,7 @@ public function similarize(AbstractNodeData $sourceNode, $isCopy = false) } if ($sourceNode instanceof NodeData) { $propertyNames[] = 'index'; + $propertyNames[] = 'removed'; } foreach ($propertyNames as $propertyName) { ObjectAccess::setProperty($this, $propertyName, ObjectAccess::getProperty($sourceNode, $propertyName)); diff --git a/Neos.ContentRepository/Tests/Functional/Domain/NodesTest.php b/Neos.ContentRepository/Tests/Functional/Domain/NodesTest.php index e173472a921..b750481a668 100644 --- a/Neos.ContentRepository/Tests/Functional/Domain/NodesTest.php +++ b/Neos.ContentRepository/Tests/Functional/Domain/NodesTest.php @@ -259,6 +259,34 @@ public function removedNodesAreNotCountedAsChildNodes() self::assertFalse($rootNode->hasChildNodes(), 'Third check.'); } + /** + * @test + */ + public function removedChildNodesAreNotCopied() + { + $rootNode = $this->context->getRootNode(); + $parentNode = $rootNode->createNode('parent'); + $parentNode->createNode('child'); + + $context = $this->contextFactory->create([ + 'workspaceName' => 'user-admin', + 'removedContentShown' => true, + ]); + $this->persistenceManager->persistAll(); + + $rootNode = $context->getRootNode(); + $parentNode = $rootNode->getNode('parent'); + self::assertTrue($parentNode->hasChildNodes(), 'Parent node should have child nodes, before they are removed'); + + $parentNode->getNode('child')->remove(); + $this->persistenceManager->persistAll(); + + $parentNode = $rootNode->getNode('parent'); + $parentClone = $parentNode->copyInto($rootNode, 'parent-clone'); + + self::assertFalse($parentClone->hasChildNodes(), 'Copied parent node should not have any child nodes'); + } + /** * @test */ diff --git a/Neos.Media.Browser/Classes/Controller/AssetController.php b/Neos.Media.Browser/Classes/Controller/AssetController.php index e49dc7aef29..f4527c0aabc 100644 --- a/Neos.Media.Browser/Classes/Controller/AssetController.php +++ b/Neos.Media.Browser/Classes/Controller/AssetController.php @@ -70,8 +70,11 @@ */ class AssetController extends ActionController { - use CreateContentContextTrait; use BackendUserTranslationTrait; + use BackendUserTranslationTrait { + BackendUserTranslationTrait::initializeObject as backendUserTranslationTraitInitializeObject; + } + use CreateContentContextTrait; use AddTranslatedFlashMessageTrait; protected const TAG_GIVEN = 0; @@ -170,6 +173,8 @@ class AssetController extends ActionController */ public function initializeObject(): void { + $this->backendUserTranslationTraitInitializeObject(); + $domain = $this->domainRepository->findOneByActiveRequest(); // Set active asset collection to the current site's asset collection, if it has one, on the first view if a matching domain is found diff --git a/Neos.Media.Browser/Resources/Private/Layouts/Default.html b/Neos.Media.Browser/Resources/Private/Layouts/Default.html index bad63b5e40c..63201d802b1 100644 --- a/Neos.Media.Browser/Resources/Private/Layouts/Default.html +++ b/Neos.Media.Browser/Resources/Private/Layouts/Default.html @@ -23,7 +23,7 @@
-
+
diff --git a/Neos.Media.Browser/Resources/Public/JavaScript/select.js b/Neos.Media.Browser/Resources/Public/JavaScript/select.js index c62e95a1743..aaf3b823f5d 100644 --- a/Neos.Media.Browser/Resources/Public/JavaScript/select.js +++ b/Neos.Media.Browser/Resources/Public/JavaScript/select.js @@ -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(); + }); + }); + })(); }); diff --git a/Neos.Neos/Classes/Controller/Backend/ModuleController.php b/Neos.Neos/Classes/Controller/Backend/ModuleController.php index 737a1b84196..163810a3e78 100644 --- a/Neos.Neos/Classes/Controller/Backend/ModuleController.php +++ b/Neos.Neos/Classes/Controller/Backend/ModuleController.php @@ -103,6 +103,7 @@ public function indexAction(array $module) $moduleResponse = new ActionResponse(); $this->dispatcher->dispatch($moduleRequest, $moduleResponse); + $moduleResponse->mergeIntoParentResponse($this->response); if ($moduleResponse->getRedirectUri() !== null) { $this->redirectToUri($moduleResponse->getRedirectUri(), 0, $moduleResponse->getStatusCode()); diff --git a/Neos.Neos/Classes/Controller/Module/Administration/UsersController.php b/Neos.Neos/Classes/Controller/Module/Administration/UsersController.php index c91ceee1e55..4ce6f5e5c9e 100644 --- a/Neos.Neos/Classes/Controller/Module/Administration/UsersController.php +++ b/Neos.Neos/Classes/Controller/Module/Administration/UsersController.php @@ -553,7 +553,7 @@ protected function getAllowedRoles(): array $roles = $this->userService->currentUserIsAdministrator() ? $this->policyService->getRoles() : $currentUserRoles; usort($roles, static function (Role $a, Role $b) { - return strcmp($a->getName(), $b->getName()); + return strcmp($a->getLabel(), $b->getLabel()); }); return $roles; diff --git a/Neos.Neos/Classes/Controller/Service/NodesController.php b/Neos.Neos/Classes/Controller/Service/NodesController.php index 65dbaf309d4..3579899aae0 100644 --- a/Neos.Neos/Classes/Controller/Service/NodesController.php +++ b/Neos.Neos/Classes/Controller/Service/NodesController.php @@ -23,7 +23,6 @@ use Neos\Neos\View\Service\NodeJsonView; use Neos\Neos\Service\Mapping\NodePropertyConverterService; use Neos\ContentRepository\Domain\Model\NodeInterface; -use Neos\ContentRepository\Domain\Model\NodeType; use Neos\ContentRepository\Domain\Service\NodeTypeManager; use Neos\ContentRepository\Domain\Utility\NodePaths; @@ -93,22 +92,9 @@ class NodesController extends ActionController */ public function indexAction($searchTerm = '', array $nodeIdentifiers = [], $workspaceName = 'live', array $dimensions = [], array $nodeTypes = ['Neos.Neos:Document'], NodeInterface $contextNode = null) { - $searchableNodeTypeNames = []; - foreach ($nodeTypes as $nodeTypeName) { - if (!$this->nodeTypeManager->hasNodeType($nodeTypeName)) { - $this->throwStatus(400, sprintf('Unknown node type "%s"', $nodeTypeName)); - } - - $searchableNodeTypeNames[$nodeTypeName] = $nodeTypeName; - /** @var NodeType $subNodeType */ - foreach ($this->nodeTypeManager->getSubNodeTypes($nodeTypeName, false) as $subNodeTypeName => $subNodeType) { - $searchableNodeTypeNames[$subNodeTypeName] = $subNodeTypeName; - } - } - $contentContext = $this->createContentContext($workspaceName, $dimensions); if ($nodeIdentifiers === []) { - $nodes = $this->nodeSearchService->findByProperties($searchTerm, $searchableNodeTypeNames, $contentContext, $contextNode); + $nodes = $this->nodeSearchService->findByProperties($searchTerm, $nodeTypes, $contentContext, $contextNode); } else { $nodes = array_filter( array_map(function ($identifier) use ($contentContext) { diff --git a/Neos.Neos/Classes/Domain/Repository/UserRepository.php b/Neos.Neos/Classes/Domain/Repository/UserRepository.php index c1d3b6f41ff..5445e674242 100644 --- a/Neos.Neos/Classes/Domain/Repository/UserRepository.php +++ b/Neos.Neos/Classes/Domain/Repository/UserRepository.php @@ -53,8 +53,8 @@ public function findBySearchTerm(string $searchTerm, string $sortBy, string $sor $query = $this->createQuery(); $query->matching( $query->logicalOr( - $query->like('accounts.accountIdentifier', '%' . $searchTerm . '%'), - $query->like('name.fullName', '%' . $searchTerm . '%') + $query->like('accounts.accountIdentifier', '%' . $searchTerm . '%', false), + $query->like('name.fullName', '%' . $searchTerm . '%', false) ) ); return $query->setOrderings([$sortBy => $sortDirection])->execute(); diff --git a/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php b/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php index a50b8c19857..bd2ce4eda5d 100644 --- a/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php +++ b/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php @@ -159,7 +159,7 @@ protected function registerAllTagsToFlushForNodeInWorkspace(NodeInterface $node, { // Ensure that we're dealing with the variant of the given node that actually // lives in the given workspace - if ($node->getWorkspace()->getName() !== $workspace->getName()) { + if ($node->isRemoved() === false && $node->getWorkspace()->getName() !== $workspace->getName()) { $workspaceContext = $this->contextFactory->create( array_merge( $node->getContext()->getProperties(), diff --git a/Neos.Neos/Documentation/Appendixes/ChangeLogs/8314.rst b/Neos.Neos/Documentation/Appendixes/ChangeLogs/8314.rst new file mode 100644 index 00000000000..8a240786f70 --- /dev/null +++ b/Neos.Neos/Documentation/Appendixes/ChangeLogs/8314.rst @@ -0,0 +1,65 @@ +`8.3.14 (2024-06-11) `_ +================================================================================================ + +Overview of merged pull requests +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +`BUGFIX: Prevent multiple imports of the same remote asset in the frontend `_ +-------------------------------------------------------------------------------------------------------------------------------------------- + +This is a frontend fix for `#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 `_ +------------------------------------------------------------------------------------------------------------- + +Removed nodes can't get found, so they regarding caches don't get flushed. + +The bug was introduced with `#4291 `_ +* Fixes: `#5105 `_ + +* Packages: ``Neos`` + +`BUGFIX: Fix title attribute for impersonate button in user management `_ +---------------------------------------------------------------------------------------------------------------------------------------- + +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 `_ + +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 `_ +- [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 `_ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/Neos.Neos/Documentation/Appendixes/ChangeLogs/8315.rst b/Neos.Neos/Documentation/Appendixes/ChangeLogs/8315.rst new file mode 100644 index 00000000000..4bf16acf4a0 --- /dev/null +++ b/Neos.Neos/Documentation/Appendixes/ChangeLogs/8315.rst @@ -0,0 +1,38 @@ +`8.3.15 (2024-06-14) `_ +================================================================================================ + +Overview of merged pull requests +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +`BUGFIX: Access isNil function from Helper function to apply selected image to property `_ +--------------------------------------------------------------------------------------------------------------------------------------------------------- + +**Upgrade instructions** + +_None_ + +**Review instructions** + +Follow-up to: `#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 `_ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/Neos.Neos/Documentation/Appendixes/ChangeLogs/8316.rst b/Neos.Neos/Documentation/Appendixes/ChangeLogs/8316.rst new file mode 100644 index 00000000000..0cc01093891 --- /dev/null +++ b/Neos.Neos/Documentation/Appendixes/ChangeLogs/8316.rst @@ -0,0 +1,63 @@ +`8.3.16 (2024-08-14) `_ +================================================================================================ + +Overview of merged pull requests +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +`BUGFIX: Don’t include subnodetypes of subnodetypes in node search `_ +-------------------------------------------------------------------------------------------------------------------------------------- + +The subnodetypes of the given filter are collected twice (once in the ``NodesController`` and once in the ``NodeDataRepository``) leading to nodetypes being included which don't inherit from the given list of nodetypes as the second list of nodetypes is not checked against the nodetypefilter but against the subnodetypes of the nodetypefilter. See details in #4502. + +* Resolves: `#4502 `_ + +* Packages: ``Neos`` + +`BUGFIX: Changed from hardcoded date format to user-localized format. `_ +--------------------------------------------------------------------------------------------------------------------------------------- + +Changes the hardcoded Y-m-d date format with an user-localized format. + +German Interface Language +!`image `_ + +English Interface Language +!`image `_ + +**Upgrade instructions** + +Tested within neos 8.3.15 + +**Review instructions** + +Changed the branch to 8.3, as i've `accidentally `_ choose 8.0 👼 +As discussed in `slack `_ we (actually Bastian) changed from a hardcoded date format to an user-localization. + + +* Packages: ``Neos`` + +`BUGFIX: Forward status codes and headers set in module actions `_ +--------------------------------------------------------------------------------------------------------------------------------- + +Previously the status code set in module actions via ``throwStatus`` or ``response->setStatusCode()`` was ignored. With this change the individual module response is merged into the generic module response which then contains the desired status code, headers and other properties. + +This is essential if the client (f.e. HTMX) relies on proper headers and status codes to behave properly. + +**Review instructions** + +Use f.e. ``$this->throwStatus(404)`` in a Neos module controller action and check the status code of the response when calling the action. +The response code should now be 404 instead of 200. + + +* Packages: ``Neos`` + +`BUGFIX: Case insensitive user search on PostgreSQL `_ +--------------------------------------------------------------------------------------------------------------------- + +PostgreSQL is by default case sensitive and its hard to find users depending on their name in the users +module. + +* Packages: ``Neos`` + +`Detailed log `_ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/Neos.Neos/Resources/Private/Templates/Module/Administration/Users/Index.html b/Neos.Neos/Resources/Private/Templates/Module/Administration/Users/Index.html index 0982754eed7..5deb9f5aaa0 100644 --- a/Neos.Neos/Resources/Private/Templates/Module/Administration/Users/Index.html +++ b/Neos.Neos/Resources/Private/Templates/Module/Administration/Users/Index.html @@ -46,7 +46,7 @@ - {account.lastSuccessfulAuthenticationDate} + {account.lastSuccessfulAuthenticationDate} diff --git a/Neos.Neos/Resources/Public/JavaScript/Main.min.js b/Neos.Neos/Resources/Public/JavaScript/Main.min.js index 8b09dea4798..d782bc31f2f 100644 --- a/Neos.Neos/Resources/Public/JavaScript/Main.min.js +++ b/Neos.Neos/Resources/Public/JavaScript/Main.min.js @@ -1,3 +1,3 @@ /*! For license information please see Main.min.js.LICENSE.txt */ -(()=>{var e={856:function(e){e.exports=function(){"use strict";function _typeof(e){return _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},_typeof(e)}function _setPrototypeOf(e,n){return _setPrototypeOf=Object.setPrototypeOf||function _setPrototypeOf(e,n){return e.__proto__=n,e},_setPrototypeOf(e,n)}function _isNativeReflectConstruct(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(e){return!1}}function _construct(e,n,r){return _construct=_isNativeReflectConstruct()?Reflect.construct:function _construct(e,n,r){var o=[null];o.push.apply(o,n);var i=new(Function.bind.apply(e,o));return r&&_setPrototypeOf(i,r.prototype),i},_construct.apply(null,arguments)}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _unsupportedIterableToArray(e,n){if(e){if("string"==typeof e)return _arrayLikeToArray(e,n);var r=Object.prototype.toString.call(e).slice(8,-1);return"Object"===r&&e.constructor&&(r=e.constructor.name),"Map"===r||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,n):void 0}}function _arrayLikeToArray(e,n){(null==n||n>e.length)&&(n=e.length);for(var r=0,o=new Array(n);r1?r-1:0),i=1;i/gm),I=s(/\${[\w\W]*}/gm),F=s(/^data-[\-\w.\u00B7-\uFFFF]/),H=s(/^aria-[\-\w]+$/),q=s(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i),B=s(/^(?:\w+script|data):/i),U=s(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g),z=s(/^html$/i),W=function getGlobal(){return"undefined"==typeof window?null:window},$=function _createTrustedTypesPolicy(e,n){if("object"!==_typeof(e)||"function"!=typeof e.createPolicy)return null;var r=null,o="data-tt-policy-suffix";n.currentScript&&n.currentScript.hasAttribute(o)&&(r=n.currentScript.getAttribute(o));var i="dompurify"+(r?"#"+r:"");try{return e.createPolicy(i,{createHTML:function createHTML(e){return e},createScriptURL:function createScriptURL(e){return e}})}catch(e){return console.warn("TrustedTypes policy "+i+" could not be created."),null}};function createDOMPurify(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:W(),n=function DOMPurify(e){return createDOMPurify(e)};if(n.version="2.4.7",n.removed=[],!e||!e.document||9!==e.document.nodeType)return n.isSupported=!1,n;var r=e.document,o=e.document,i=e.DocumentFragment,s=e.HTMLTemplateElement,l=e.Node,c=e.Element,u=e.NodeFilter,d=e.NamedNodeMap,V=void 0===d?e.NamedNodeMap||e.MozNamedAttrMap:d,G=e.HTMLFormElement,K=e.DOMParser,X=e.trustedTypes,Y=c.prototype,J=lookupGetter(Y,"cloneNode"),Q=lookupGetter(Y,"nextSibling"),Z=lookupGetter(Y,"childNodes"),ee=lookupGetter(Y,"parentNode");if("function"==typeof s){var te=o.createElement("template");te.content&&te.content.ownerDocument&&(o=te.content.ownerDocument)}var ne=$(X,r),re=ne?ne.createHTML(""):"",oe=o,ie=oe.implementation,ae=oe.createNodeIterator,se=oe.createDocumentFragment,le=oe.getElementsByTagName,ce=r.importNode,ue={};try{ue=clone(o).documentMode?o.documentMode:{}}catch(e){}var de={};n.isSupported="function"==typeof ee&&ie&&void 0!==ie.createHTMLDocument&&9!==ue;var pe,fe,he=M,ge=R,me=I,ye=F,ve=H,be=B,xe=U,we=q,Se=null,Te=addToSet({},[].concat(_toConsumableArray(T),_toConsumableArray(k),_toConsumableArray(C),_toConsumableArray(A),_toConsumableArray(L))),ke=null,Ce=addToSet({},[].concat(_toConsumableArray(O),_toConsumableArray(P),_toConsumableArray(D),_toConsumableArray(j))),Ee=Object.seal(Object.create(null,{tagNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},attributeNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},allowCustomizedBuiltInElements:{writable:!0,configurable:!1,enumerable:!0,value:!1}})),Ae=null,Ne=null,_e=!0,Le=!0,Oe=!1,Pe=!0,De=!1,je=!1,Me=!1,Re=!1,Ie=!1,Fe=!1,He=!1,qe=!0,Be=!1,Ue="user-content-",ze=!0,We=!1,$e={},Ve=null,Ge=addToSet({},["annotation-xml","audio","colgroup","desc","foreignobject","head","iframe","math","mi","mn","mo","ms","mtext","noembed","noframes","noscript","plaintext","script","style","svg","template","thead","title","video","xmp"]),Ke=null,Xe=addToSet({},["audio","video","img","source","image","track"]),Ye=null,Je=addToSet({},["alt","class","for","id","label","name","pattern","placeholder","role","summary","title","value","style","xmlns"]),Qe="http://www.w3.org/1998/Math/MathML",Ze="http://www.w3.org/2000/svg",et="http://www.w3.org/1999/xhtml",tt=et,nt=!1,rt=null,ot=addToSet({},[Qe,Ze,et],m),it=["application/xhtml+xml","text/html"],at="text/html",st=null,lt=o.createElement("form"),ct=function isRegexOrFunction(e){return e instanceof RegExp||e instanceof Function},ut=function _parseConfig(e){st&&st===e||(e&&"object"===_typeof(e)||(e={}),e=clone(e),pe=pe=-1===it.indexOf(e.PARSER_MEDIA_TYPE)?at:e.PARSER_MEDIA_TYPE,fe="application/xhtml+xml"===pe?m:g,Se="ALLOWED_TAGS"in e?addToSet({},e.ALLOWED_TAGS,fe):Te,ke="ALLOWED_ATTR"in e?addToSet({},e.ALLOWED_ATTR,fe):Ce,rt="ALLOWED_NAMESPACES"in e?addToSet({},e.ALLOWED_NAMESPACES,m):ot,Ye="ADD_URI_SAFE_ATTR"in e?addToSet(clone(Je),e.ADD_URI_SAFE_ATTR,fe):Je,Ke="ADD_DATA_URI_TAGS"in e?addToSet(clone(Xe),e.ADD_DATA_URI_TAGS,fe):Xe,Ve="FORBID_CONTENTS"in e?addToSet({},e.FORBID_CONTENTS,fe):Ge,Ae="FORBID_TAGS"in e?addToSet({},e.FORBID_TAGS,fe):{},Ne="FORBID_ATTR"in e?addToSet({},e.FORBID_ATTR,fe):{},$e="USE_PROFILES"in e&&e.USE_PROFILES,_e=!1!==e.ALLOW_ARIA_ATTR,Le=!1!==e.ALLOW_DATA_ATTR,Oe=e.ALLOW_UNKNOWN_PROTOCOLS||!1,Pe=!1!==e.ALLOW_SELF_CLOSE_IN_ATTR,De=e.SAFE_FOR_TEMPLATES||!1,je=e.WHOLE_DOCUMENT||!1,Ie=e.RETURN_DOM||!1,Fe=e.RETURN_DOM_FRAGMENT||!1,He=e.RETURN_TRUSTED_TYPE||!1,Re=e.FORCE_BODY||!1,qe=!1!==e.SANITIZE_DOM,Be=e.SANITIZE_NAMED_PROPS||!1,ze=!1!==e.KEEP_CONTENT,We=e.IN_PLACE||!1,we=e.ALLOWED_URI_REGEXP||we,tt=e.NAMESPACE||et,Ee=e.CUSTOM_ELEMENT_HANDLING||{},e.CUSTOM_ELEMENT_HANDLING&&ct(e.CUSTOM_ELEMENT_HANDLING.tagNameCheck)&&(Ee.tagNameCheck=e.CUSTOM_ELEMENT_HANDLING.tagNameCheck),e.CUSTOM_ELEMENT_HANDLING&&ct(e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck)&&(Ee.attributeNameCheck=e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck),e.CUSTOM_ELEMENT_HANDLING&&"boolean"==typeof e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements&&(Ee.allowCustomizedBuiltInElements=e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements),De&&(Le=!1),Fe&&(Ie=!0),$e&&(Se=addToSet({},_toConsumableArray(L)),ke=[],!0===$e.html&&(addToSet(Se,T),addToSet(ke,O)),!0===$e.svg&&(addToSet(Se,k),addToSet(ke,P),addToSet(ke,j)),!0===$e.svgFilters&&(addToSet(Se,C),addToSet(ke,P),addToSet(ke,j)),!0===$e.mathMl&&(addToSet(Se,A),addToSet(ke,D),addToSet(ke,j))),e.ADD_TAGS&&(Se===Te&&(Se=clone(Se)),addToSet(Se,e.ADD_TAGS,fe)),e.ADD_ATTR&&(ke===Ce&&(ke=clone(ke)),addToSet(ke,e.ADD_ATTR,fe)),e.ADD_URI_SAFE_ATTR&&addToSet(Ye,e.ADD_URI_SAFE_ATTR,fe),e.FORBID_CONTENTS&&(Ve===Ge&&(Ve=clone(Ve)),addToSet(Ve,e.FORBID_CONTENTS,fe)),ze&&(Se["#text"]=!0),je&&addToSet(Se,["html","head","body"]),Se.table&&(addToSet(Se,["tbody"]),delete Ae.tbody),a&&a(e),st=e)},dt=addToSet({},["mi","mo","mn","ms","mtext"]),pt=addToSet({},["foreignobject","desc","title","annotation-xml"]),ft=addToSet({},["title","style","font","a","script"]),ht=addToSet({},k);addToSet(ht,C),addToSet(ht,E);var gt=addToSet({},A);addToSet(gt,N);var mt=function _checkValidNamespace(e){var n=ee(e);n&&n.tagName||(n={namespaceURI:tt,tagName:"template"});var r=g(e.tagName),o=g(n.tagName);return!!rt[e.namespaceURI]&&(e.namespaceURI===Ze?n.namespaceURI===et?"svg"===r:n.namespaceURI===Qe?"svg"===r&&("annotation-xml"===o||dt[o]):Boolean(ht[r]):e.namespaceURI===Qe?n.namespaceURI===et?"math"===r:n.namespaceURI===Ze?"math"===r&&pt[o]:Boolean(gt[r]):e.namespaceURI===et?!(n.namespaceURI===Ze&&!pt[o])&&!(n.namespaceURI===Qe&&!dt[o])&&!gt[r]&&(ft[r]||!ht[r]):!("application/xhtml+xml"!==pe||!rt[e.namespaceURI]))},yt=function _forceRemove(e){h(n.removed,{element:e});try{e.parentNode.removeChild(e)}catch(n){try{e.outerHTML=re}catch(n){e.remove()}}},vt=function _removeAttribute(e,r){try{h(n.removed,{attribute:r.getAttributeNode(e),from:r})}catch(e){h(n.removed,{attribute:null,from:r})}if(r.removeAttribute(e),"is"===e&&!ke[e])if(Ie||Fe)try{yt(r)}catch(e){}else try{r.setAttribute(e,"")}catch(e){}},bt=function _initDocument(e){var n,r;if(Re)e=""+e;else{var i=y(e,/^[\r\n\t ]+/);r=i&&i[0]}"application/xhtml+xml"===pe&&tt===et&&(e=''+e+"");var a=ne?ne.createHTML(e):e;if(tt===et)try{n=(new K).parseFromString(a,pe)}catch(e){}if(!n||!n.documentElement){n=ie.createDocument(tt,"template",null);try{n.documentElement.innerHTML=nt?re:a}catch(e){}}var s=n.body||n.documentElement;return e&&r&&s.insertBefore(o.createTextNode(r),s.childNodes[0]||null),tt===et?le.call(n,je?"html":"body")[0]:je?n.documentElement:s},xt=function _createIterator(e){return ae.call(e.ownerDocument||e,e,u.SHOW_ELEMENT|u.SHOW_COMMENT|u.SHOW_TEXT,null,!1)},wt=function _isClobbered(e){return e instanceof G&&("string"!=typeof e.nodeName||"string"!=typeof e.textContent||"function"!=typeof e.removeChild||!(e.attributes instanceof V)||"function"!=typeof e.removeAttribute||"function"!=typeof e.setAttribute||"string"!=typeof e.namespaceURI||"function"!=typeof e.insertBefore||"function"!=typeof e.hasChildNodes)},St=function _isNode(e){return"object"===_typeof(l)?e instanceof l:e&&"object"===_typeof(e)&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName},Tt=function _executeHook(e,r,o){de[e]&&p(de[e],(function(e){e.call(n,r,o,st)}))},kt=function _sanitizeElements(e){var r;if(Tt("beforeSanitizeElements",e,null),wt(e))return yt(e),!0;if(w(/[\u0080-\uFFFF]/,e.nodeName))return yt(e),!0;var o=fe(e.nodeName);if(Tt("uponSanitizeElement",e,{tagName:o,allowedTags:Se}),e.hasChildNodes()&&!St(e.firstElementChild)&&(!St(e.content)||!St(e.content.firstElementChild))&&w(/<[/\w]/g,e.innerHTML)&&w(/<[/\w]/g,e.textContent))return yt(e),!0;if("select"===o&&w(/