') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); [4.x] Fix some multisite issues by jasonvarga · Pull Request #8505 · statamic/cms · GitHub
Skip to content

[4.x] Fix some multisite issues - #8505

Merged
jasonvarga merged 18 commits into
4.xfrom
multisite-issues
Aug 8, 2023
Merged

[4.x] Fix some multisite issues#8505
jasonvarga merged 18 commits into
4.xfrom
multisite-issues

Conversation

@jasonvarga

@jasonvargajasonvarga commented Jul 28, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Replaces #7339, thanks @wanze!

Items would become out of sync because we had $localizations and $origin properties on the Entry objects.
When they would get pulled from the cache, they would contain references to older Entry instances.

e.g. This flow:

  • Entry is created
  • Localization of that entry is created.
    • Leave a field unlocalized. The behavior should be to fall back to whatever is in the origin entry.
    • The $origin property has the original entry which contains its values.
  • Save the localization, the object instance gets placed into the cache.
  • Edit that field in the original entry, and save it.
  • Load the localization.
    • Since the origin was still directly on the property, it doesn't attempt to load a fresh version.
    • The incorrectly cached origin entry still contains an old value.
    • The localized entry's field appears outdated.

The $localizations causes a similar issue.

  • Re-save an entry that already has localizations. The array is saved on the property.
  • Save a localization.
  • Load the origin entry, it still contains references to outdated localizations.

This is fixed by removing the properties. Blink is used instead to optimize repeated queries, which is the reason for the property caches in the first place.

Now when you load entries from the cache, since the properties aren't there, the related entries need to be requeried and will be up to date.

On save/delete, we save descendant entries in order to bust the blink caches, as well as busting the ancestor's blink caches.

By re-saving all the descendant entries, these issues also get resolved:

@jasonvargajasonvarga mentioned this pull request Jul 28, 2023
Closed
@jasonvarga
jasonvarga marked this pull request as draft July 28, 2023 14:25
@jasonvarga
Clear the blink key ...
ecb10f8
It worked fine in the browser because the blink would be empty on the next request.
In the test its all one process, and the blink would stick around.
This would be the same problem in a worker too.
@jasonvarga
directDescendants - like descendants without recursion
a6122d9
@jasonvarga
make sure the descendants only get saved one time. track the blinks t…
bc4ce36
…o make sure they get wiped.
@jasonvarga
use merge which is immutable. using push affected unrelated areas.
54c5762
@jasonvarga
avoid using property cache in globals ...
8ee3a19
variables test now needs make sure that localizations get added onto the global itself. the way the test was written wasn't a realistic setup. you'd need to add the localizations in reality anyway.
@jasonvarga
fake the origin method in the pluck modifier so passing an object sti…
4e854be
…ll works
@jasonvarga
flip logic to allow integer based ids to work
5f233f3
@jasonvarga
protected is fine
4b47998
@jasonvarga
jasonvarga marked this pull request as ready for review July 31, 2023 19:49
@jasonvargajasonvarga mentioned this pull request Jul 31, 2023
Merged
@jasonvarga
jasonvarga marked this pull request as draft July 31, 2023 21:03
@jasonvargajasonvarga mentioned this pull request Aug 1, 2023
Merged
@jasonvarga
Merge branch '4.x' into multisite-issues
cc93527
# Conflicts:
#	src/Globals/GlobalSet.php
@jasonvarga
jasonvarga marked this pull request as ready for review August 8, 2023 20:49
@jasonvarga
jasonvarga merged commit e91df0d into 4.xAug 8, 2023
@jasonvarga
jasonvarga deleted the multisite-issues branch August 8, 2023 20:49
@jasonvargajasonvarga mentioned this pull request Aug 21, 2023
Merged
@jesseleitejesseleite mentioned this pull request May 8, 2025
Closed
@duncanmccleanduncanmcclean mentioned this pull request Jul 14, 2025
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment