fix: scope locale context to current query and not reuse globally #211
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
pieh
force-pushed
the
parallel-queries-overwrites
branch
from
7e7b64b to
4315471
Compare
|
Hey @pieh thank you very much for this! We are going to check it and get back to you later during the week as we cannot sooner. |
pieh
commented
Jan 9, 2023
Comment on lines
-38
to
-43
| if (context.sourceDatocms.localeState) { | ||
| context.sourceDatocms.localeState.clear(info); | ||
| } | ||
| if (context.sourceDatocms.fallbackLocales) { | ||
| context.sourceDatocms.fallbackLocales.clear(info); | ||
| } |
There was a problem hiding this comment.
This was a code smell that something is not right - if something has to clear data for current info.path which should be first time we visit it - the setup seemed problematic overall.
Now with fresh "locale context" it should be just not possible for those things to have to be cleared as we should enter this code path for given info.path for the first time every time
pieh
commented
Jan 9, 2023
Comment on lines
10
to
+32
| if (args.locale) { | ||
| context.sourceDatocms.localeState.set(info, args.locale); | ||
| context.sourceDatocms | ||
| .getQueryContext(context) | ||
| .localeState.set(info, args.locale); | ||
| } | ||
|
|
||
| if (args.fallbackLocales) { | ||
| context.sourceDatocms.fallbackLocalesState.set(info, args.fallbackLocales); | ||
| context.sourceDatocms | ||
| .getQueryContext(context) | ||
| .fallbackLocalesState.set(info, args.fallbackLocales); | ||
| } | ||
|
|
||
| const locale = context.sourceDatocms.localeState.get(info) || mainLocale; | ||
| const locale = | ||
| context.sourceDatocms.getQueryContext(context).localeState.get(info) || | ||
| mainLocale; | ||
|
|
||
| return { | ||
| locale, | ||
| fallbacks: { | ||
| [locale]: context.sourceDatocms.fallbackLocalesState.get(info) || [], | ||
| [locale]: | ||
| context.sourceDatocms | ||
| .getQueryContext(context) | ||
| .fallbackLocalesState.get(info) || [], |
There was a problem hiding this comment.
This has 4 repeated context.sourceDatocms.getQueryContext(context) calls, which could be deduped
pieh
force-pushed
the
parallel-queries-overwrites
branch
from
4315471 to
2462344
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.
#209 describe how sometimes nested fields don't honor
localesettings. This happens because thecontext.sourceDatocmsobject is actually reused between all the queries that run in given process and state there is scope to just field paths within the query. Gatsby can execute multiple queries in parallel (especially for the builds as it does batching of all queries), so this shared state object is a problem as one query for one page might change the context that query for other page rely on.Proposed fix provide fresh
localeandlocaleFallbackfor each query seperately - I implemented this in shortest way possible, there is opportunity for some optimisation as right now there is a lot of repeated.getlookups which I kept for visibilty and easier to follow proposed changesPossibly fixes #209