[Conflicts] Merge main into next #2633
Open
Conversation
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 adds redis to docker-compose and a cache-handler implementation based on "a big project of vivid-planet".
Certain GraphQL-related errors were hard to debug in applications. We make two changes to improve this: 1. Add the request body to the error message if the request fails. GraphQL schema validation errors are treated as 400 errors, so the error handling for GraphQL errors was never "reached". 2. Add a useful error message when importing a GraphQL document from a React Client Component.
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
4c98c64
to
7ba4154
Compare
We sometimes need the affected content scope(s) in a block's transformer service. To enable this, we set the content scopes retrieved in the `UserPermissionsGuard` in the `request` object (similar to how the `AuthGuard` sets the `user` ). This then allows accessing the content scopes in the transformer service.
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
7ba4154
to
c49690b
Compare
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
c49690b
to
ab7c3b1
Compare
Large number of redirects can cause issues in real projects. Help on improving the situation by making the API a bit faster.(that alone won't be the solution). - Add fixtures that create 7000 redirects (for this the additional exports are needed) - Add a relatively simple performance optimization in redirects resolver: Call `this.pageTreeReadApi.preloadNodes(scope);` to load the whole page tree into memory, as most redirects will access it (when they are internal) - Local tests showed (when loading 100 redirects) ~250ms (before) vs ~100ms (after) (!) - (Demo only) Add an index on `Redirect.scope_domain` - No difference in Demo performance, but much needed in "real" multidomain applications - Unfortunately this won't be generated by MikroORM, as the redirect entity is in library only - And increase the maximum limit for paginated redirects query from 100 to 1000 - Not much improvement, but still ~4.8s (before) vs ~3.2s (after) (both with preloadNodes) --------- Co-authored-by: Johannes Obermair <48853629+johnnyomair@users.noreply.github.com>
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
ab7c3b1
to
3a5604a
Compare
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
3a5604a
to
630e259
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automated pull request to merge changes from
mainintonext. It has merge conflicts. To resolve conflicts, check out the branchmerge-main-into-nextlocally, make any necessary changes to conflicting files, and commit and publish your changes.