[5.x] Move updating from collection repo to entry repo#10383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonvarga merged 6 commits into from
Jul 10, 2024
Merged

[5.x] Move updating from collection repo to entry repo #10383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
893c9c0
move updating of entry uris from collection repo into entry repo
jasonvarga Jul 2, 2024
6a34353
wip
jasonvarga Jul 2, 2024
bc7ac3c
Merge branch '5.x' into collections-doing-stuff-entries-should-probab…
jasonvarga Jul 5, 2024
3009e2a
fix test
jasonvarga Jul 9, 2024
7930aca
wip
jasonvarga Jul 9, 2024
dbc7c64
Merge branch '5.x' into collections-doing-stuff-entries-should-probab…
jasonvarga Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Entries/Collection.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -503,21 +503,21 @@ public function save()

public function updateEntryUris($ids = null)
{
Facades\Collection::updateEntryUris($this, $ids);
Facades\Entry::updateUris($this, $ids);

return $this;
}

public function updateEntryOrder($ids = null)
{
Facades\Collection::updateEntryOrder($this, $ids);
Facades\Entry::updateOrders($this, $ids);

return $this;
}

public function updateEntryParent($ids = null)
{
Facades\Collection::updateEntryParent($this, $ids);
Facades\Entry::updateParents($this, $ids);

return $this;
}
Expand Down
12 changes: 9 additions & 3 deletions src/Stache/Repositories/CollectionRepository.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Data\StoresScopedComputedFieldCallbacks;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Entry;
use Statamic\Stache\Stache;

class CollectionRepository implements RepositoryContract
Expand DownExpand Up@@ -96,19 +97,24 @@ public function delete(Collection $collection)
$this->store->delete($collection);
}

/**
* @deprecated Use Entry::updateUris($collection, $ids)
*/
public function updateEntryUris(Collection $collection, $ids = null)
{
$this->store->updateEntryUris($collection, $ids);
Entry::updateUris($collection, $ids);
}

/** @deprecated Use Entry::updateOrders($collection, $ids) */
public function updateEntryOrder(Collection $collection, $ids = null)
{
$this->store->updateEntryOrder($collection, $ids);
Entry::updateOrders($collection, $ids);
}

/** @deprecated Use Entry::updateParents($collection, $ids) */
public function updateEntryParent(Collection $collection, $ids = null)
{
$this->store->updateEntryParent($collection, $ids);
Entry::updateParents($collection, $ids);
}

public function whereStructured(): IlluminateCollection
Expand Down
15 changes: 15 additions & 0 deletions src/Stache/Repositories/EntryRepository.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,4 +163,19 @@ public function applySubstitutions($items)
return $this->substitutionsById[$item->id()] ?? $item;
});
}

public function updateUris($collection, $ids = null)
{
$this->store->store($collection->handle())->updateUris($ids);
}

public function updateOrders($collection, $ids = null)
{
$this->store->store($collection->handle())->updateOrders($ids);
}

public function updateParents($collection, $ids = null)
{
$this->store->store($collection->handle())->updateParents($ids);
}
}
39 changes: 39 additions & 0 deletions src/Stache/Stores/CollectionEntriesStore.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -251,4 +251,43 @@ public function withoutBlinkingEntryUris($callback)

return $return;
}

public function updateUris($ids = null)
{
$this->updateEntriesWithinIndex($this->index('uri'), $ids);
$this->updateEntriesWithinStore($ids);
}

public function updateOrders($ids = null)
{
$this->updateEntriesWithinIndex($this->index('order'), $ids);
}

public function updateParents($ids = null)
{
$this->updateEntriesWithinIndex($this->index('parent'), $ids);
}

private function updateEntriesWithinIndex($index, $ids)
{
if (empty($ids)) {
return $index->update();
}

collect($ids)
->map(fn ($id) => Entry::find($id))
->filter()
->each(fn ($entry) => $index->updateItem($entry));
}

private function updateEntriesWithinStore($ids)
{
if (empty($ids)) {
$ids = $this->paths()->keys();
}

$entries = $this->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

$entries->each(fn ($entry) => $this->cacheItem($entry));
}
}
49 changes: 0 additions & 49 deletions src/Stache/Stores/CollectionsStore.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
namespace Statamic\Stache\Stores;

use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\Path;
use Statamic\Facades\Site;
use Statamic\Facades\Stache;
Expand DownExpand Up@@ -82,54 +81,6 @@ protected function getDefaultPublishState($data)
return $value === 'published';
}

public function updateEntryUris($collection, $ids = null)
{
$store = Stache::store('entries')->store($collection->handle());
$this->updateEntriesWithinIndex($store->index('uri'), $ids);
$this->updateEntriesWithinStore($store, $ids);
}

private function updateEntriesWithinStore($store, $ids)
{
if (empty($ids)) {
$ids = $store->paths()->keys();
}

$entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

$entries->each(fn ($entry) => $store->cacheItem($entry));
}

public function updateEntryOrder($collection, $ids = null)
{
$index = Stache::store('entries')
->store($collection->handle())
->index('order');

$this->updateEntriesWithinIndex($index, $ids);
}

public function updateEntryParent($collection, $ids = null)
{
$index = Stache::store('entries')
->store($collection->handle())
->index('parent');

$this->updateEntriesWithinIndex($index, $ids);
}

private function updateEntriesWithinIndex($index, $ids)
{
if (empty($ids)) {
return $index->update();
}

collect($ids)
->map(fn ($id) => Entry::find($id))
->filter()
->each(fn ($entry) => $index->updateItem($entry));
}

public function handleFileChanges()
{
if ($this->fileChangesHandled || ! Stache::isWatcherEnabled()) {
Expand Down
30 changes: 27 additions & 3 deletions tests/Data/Entries/CollectionTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -865,17 +865,41 @@ public function it_gets_the_uri_and_url_from_the_mounted_entry()
}

#[Test]
public function it_updates_entry_uris_through_the_repository()
public function it_updates_entry_uris_through_the_entry_repository()
{
$collection = (new Collection)->handle('test');

Facades\Collection::shouldReceive('updateEntryUris')->with($collection, null)->once()->ordered();
Facades\Collection::shouldReceive('updateEntryUris')->with($collection, ['one', 'two'])->once()->ordered();
Facades\Entry::shouldReceive('updateUris')->with($collection, null)->once()->ordered();
Facades\Entry::shouldReceive('updateUris')->with($collection, ['one', 'two'])->once()->ordered();

$collection->updateEntryUris();
$collection->updateEntryUris(['one', 'two']);
}

#[Test]
public function it_updates_entry_orders_through_the_entry_repository()
{
$collection = (new Collection)->handle('test');

Facades\Entry::shouldReceive('updateOrders')->with($collection, null)->once()->ordered();
Facades\Entry::shouldReceive('updateOrders')->with($collection, ['one', 'two'])->once()->ordered();

$collection->updateEntryOrder();
$collection->updateEntryOrder(['one', 'two']);
}

#[Test]
public function it_updates_entry_parents_through_the_entry_repository()
{
$collection = (new Collection)->handle('test');

Facades\Entry::shouldReceive('updateParents')->with($collection, null)->once()->ordered();
Facades\Entry::shouldReceive('updateParents')->with($collection, ['one', 'two'])->once()->ordered();

$collection->updateEntryParent();
$collection->updateEntryParent(['one', 'two']);
}

#[Test]
#[DataProvider('additionalPreviewTargetProvider')]
public function it_gets_and_sets_preview_targets($throughFacade)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[5.x] Move updating from collection repo to entry repo#10383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Jul 10, 2024
 Merged


[5.x] Move updating from collection repo to entry repo
#10383
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
893c9c0

move updating of entry uris from collection repo into entry repo


jasonvarga Jul 2, 2024
6a34353

wip


jasonvarga Jul 2, 2024
bc7ac3c

Merge branch '5.x' into collections-doing-stuff-entries-should-probab…


jasonvarga Jul 5, 2024
3009e2a

fix test


jasonvarga Jul 9, 2024
7930aca

wip


jasonvarga Jul 9, 2024
dbc7c64

Merge branch '5.x' into collections-doing-stuff-entries-should-probab…


jasonvarga Jul 10, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
src/Entries/Collection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -503,21 +503,21 @@ public function save()

 public function updateEntryUris($ids = null)
 {
 Facades\Collection::updateEntryUris($this, $ids);
 Facades\Entry::updateUris($this, $ids);

 return $this;
 }

 public function updateEntryOrder($ids = null)
 {
 Facades\Collection::updateEntryOrder($this, $ids);
 Facades\Entry::updateOrders($this, $ids);

 return $this;
 }

 public function updateEntryParent($ids = null)
 {
 Facades\Collection::updateEntryParent($this, $ids);
 Facades\Entry::updateParents($this, $ids);

 return $this;
 }
Expand Down

12 changes: 9 additions & 3 deletions
src/Stache/Repositories/CollectionRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Data\StoresScopedComputedFieldCallbacks;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Entry;
use Statamic\Stache\Stache;

class CollectionRepository implements RepositoryContract
Expand DownExpand Up@@ -96,19 +97,24 @@ public function delete(Collection $collection)
 $this->store->delete($collection);
 }

 /**
 * @deprecated Use Entry::updateUris($collection, $ids)
 */
 public function updateEntryUris(Collection $collection, $ids = null)
 {
$this->store->updateEntryUris($collection, $ids);
Entry::updateUris($collection, $ids);
 }

 /** @deprecated Use Entry::updateOrders($collection, $ids) */
 public function updateEntryOrder(Collection $collection, $ids = null)
 {
$this->store->updateEntryOrder($collection, $ids);
Entry::updateOrders($collection, $ids);
 }

 /** @deprecated Use Entry::updateParents($collection, $ids) */
 public function updateEntryParent(Collection $collection, $ids = null)
 {
$this->store->updateEntryParent($collection, $ids);
Entry::updateParents($collection, $ids);
 }

 public function whereStructured(): IlluminateCollection
Expand Down

15 changes: 15 additions & 0 deletions
src/Stache/Repositories/EntryRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,4 +163,19 @@ public function applySubstitutions($items)
 return $this->substitutionsById[$item->id()] ?? $item;
 });
 }

 public function updateUris($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateUris($ids);
 }

 public function updateOrders($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateOrders($ids);
 }

 public function updateParents($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateParents($ids);
 }
}

39 changes: 39 additions & 0 deletions
src/Stache/Stores/CollectionEntriesStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,4 +251,43 @@ public function withoutBlinkingEntryUris($callback)

 return $return;
 }

 public function updateUris($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('uri'), $ids);
 $this->updateEntriesWithinStore($ids);
 }

 public function updateOrders($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('order'), $ids);
 }

 public function updateParents($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('parent'), $ids);
 }

 private function updateEntriesWithinIndex($index, $ids)
 {
 if (empty($ids)) {
 return $index->update();
 }

 collect($ids)
 ->map(fn ($id) => Entry::find($id))
 ->filter()
 ->each(fn ($entry) => $index->updateItem($entry));
 }

 private function updateEntriesWithinStore($ids)
 {
 if (empty($ids)) {
 $ids = $this->paths()->keys();
 }

 $entries = $this->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $this->cacheItem($entry));
 }
}

49 changes: 0 additions & 49 deletions
src/Stache/Stores/CollectionsStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
namespace Statamic\Stache\Stores;

use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\Path;
use Statamic\Facades\Site;
use Statamic\Facades\Stache;
Expand DownExpand Up@@ -82,54 +81,6 @@ protected function getDefaultPublishState($data)
 return $value === 'published';
 }

 public function updateEntryUris($collection, $ids = null)
 {
 $store = Stache::store('entries')->store($collection->handle());
 $this->updateEntriesWithinIndex($store->index('uri'), $ids);
 $this->updateEntriesWithinStore($store, $ids);
 }

 private function updateEntriesWithinStore($store, $ids)
 {
 if (empty($ids)) {
 $ids = $store->paths()->keys();
 }

 $entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $store->cacheItem($entry));
 }

 public function updateEntryOrder($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('order');

 $this->updateEntriesWithinIndex($index, $ids);
 }

 public function updateEntryParent($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('parent');

 $this->updateEntriesWithinIndex($index, $ids);
 }

 private function updateEntriesWithinIndex($index, $ids)
 {
 if (empty($ids)) {
 return $index->update();
 }

 collect($ids)
 ->map(fn ($id) => Entry::find($id))
 ->filter()
 ->each(fn ($entry) => $index->updateItem($entry));
 }

 public function handleFileChanges()
 {
 if ($this->fileChangesHandled || ! Stache::isWatcherEnabled()) {
Expand Down

30 changes: 27 additions & 3 deletions
tests/Data/Entries/CollectionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -865,17 +865,41 @@ public function it_gets_the_uri_and_url_from_the_mounted_entry()
 }

 #[Test]
 public function it_updates_entry_uris_through_the_repository()
 public function it_updates_entry_uris_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Collection::shouldReceive('updateEntryUris')->with($collection, null)->once()->ordered();
 Facades\Collection::shouldReceive('updateEntryUris')->with($collection, ['one', 'two'])->once()->ordered();
 Facades\Entry::shouldReceive('updateUris')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateUris')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryUris();
 $collection->updateEntryUris(['one', 'two']);
 }

 #[Test]
 public function it_updates_entry_orders_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Entry::shouldReceive('updateOrders')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateOrders')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryOrder();
 $collection->updateEntryOrder(['one', 'two']);
 }

 #[Test]
 public function it_updates_entry_parents_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Entry::shouldReceive('updateParents')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateParents')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryParent();
 $collection->updateEntryParent(['one', 'two']);
 }

 #[Test]
 #[DataProvider('additionalPreviewTargetProvider')]
 public function it_gets_and_sets_preview_targets($throughFacade)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[5.x] Move updating from collection repo to entry repo#10383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Jul 10, 2024
 Merged


[5.x] Move updating from collection repo to entry repo
#10383
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
893c9c0

move updating of entry uris from collection repo into entry repo


jasonvarga Jul 2, 2024
6a34353

wip


jasonvarga Jul 2, 2024
bc7ac3c

Merge branch '5.x' into collections-doing-stuff-entries-should-probab…


jasonvarga Jul 5, 2024
3009e2a

fix test


jasonvarga Jul 9, 2024
7930aca

wip


jasonvarga Jul 9, 2024
dbc7c64

Merge branch '5.x' into collections-doing-stuff-entries-should-probab…


jasonvarga Jul 10, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
src/Entries/Collection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -503,21 +503,21 @@ public function save()

 public function updateEntryUris($ids = null)
 {
 Facades\Collection::updateEntryUris($this, $ids);
 Facades\Entry::updateUris($this, $ids);

 return $this;
 }

 public function updateEntryOrder($ids = null)
 {
 Facades\Collection::updateEntryOrder($this, $ids);
 Facades\Entry::updateOrders($this, $ids);

 return $this;
 }

 public function updateEntryParent($ids = null)
 {
 Facades\Collection::updateEntryParent($this, $ids);
 Facades\Entry::updateParents($this, $ids);

 return $this;
 }
Expand Down

12 changes: 9 additions & 3 deletions
src/Stache/Repositories/CollectionRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Data\StoresScopedComputedFieldCallbacks;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Entry;
use Statamic\Stache\Stache;

class CollectionRepository implements RepositoryContract
Expand DownExpand Up@@ -96,19 +97,24 @@ public function delete(Collection $collection)
 $this->store->delete($collection);
 }

 /**
 * @deprecated Use Entry::updateUris($collection, $ids)
 */
 public function updateEntryUris(Collection $collection, $ids = null)
 {
$this->store->updateEntryUris($collection, $ids);
Entry::updateUris($collection, $ids);
 }

 /** @deprecated Use Entry::updateOrders($collection, $ids) */
 public function updateEntryOrder(Collection $collection, $ids = null)
 {
$this->store->updateEntryOrder($collection, $ids);
Entry::updateOrders($collection, $ids);
 }

 /** @deprecated Use Entry::updateParents($collection, $ids) */
 public function updateEntryParent(Collection $collection, $ids = null)
 {
$this->store->updateEntryParent($collection, $ids);
Entry::updateParents($collection, $ids);
 }

 public function whereStructured(): IlluminateCollection
Expand Down

15 changes: 15 additions & 0 deletions
src/Stache/Repositories/EntryRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,4 +163,19 @@ public function applySubstitutions($items)
 return $this->substitutionsById[$item->id()] ?? $item;
 });
 }

 public function updateUris($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateUris($ids);
 }

 public function updateOrders($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateOrders($ids);
 }

 public function updateParents($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateParents($ids);
 }
}

39 changes: 39 additions & 0 deletions
src/Stache/Stores/CollectionEntriesStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,4 +251,43 @@ public function withoutBlinkingEntryUris($callback)

 return $return;
 }

 public function updateUris($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('uri'), $ids);
 $this->updateEntriesWithinStore($ids);
 }

 public function updateOrders($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('order'), $ids);
 }

 public function updateParents($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('parent'), $ids);
 }

 private function updateEntriesWithinIndex($index, $ids)
 {
 if (empty($ids)) {
 return $index->update();
 }

 collect($ids)
 ->map(fn ($id) => Entry::find($id))
 ->filter()
 ->each(fn ($entry) => $index->updateItem($entry));
 }

 private function updateEntriesWithinStore($ids)
 {
 if (empty($ids)) {
 $ids = $this->paths()->keys();
 }

 $entries = $this->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $this->cacheItem($entry));
 }
}

49 changes: 0 additions & 49 deletions
src/Stache/Stores/CollectionsStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
namespace Statamic\Stache\Stores;

use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\Path;
use Statamic\Facades\Site;
use Statamic\Facades\Stache;
Expand DownExpand Up@@ -82,54 +81,6 @@ protected function getDefaultPublishState($data)
 return $value === 'published';
 }

 public function updateEntryUris($collection, $ids = null)
 {
 $store = Stache::store('entries')->store($collection->handle());
 $this->updateEntriesWithinIndex($store->index('uri'), $ids);
 $this->updateEntriesWithinStore($store, $ids);
 }

 private function updateEntriesWithinStore($store, $ids)
 {
 if (empty($ids)) {
 $ids = $store->paths()->keys();
 }

 $entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $store->cacheItem($entry));
 }

 public function updateEntryOrder($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('order');

 $this->updateEntriesWithinIndex($index, $ids);
 }

 public function updateEntryParent($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('parent');

 $this->updateEntriesWithinIndex($index, $ids);
 }

 private function updateEntriesWithinIndex($index, $ids)
 {
 if (empty($ids)) {
 return $index->update();
 }

 collect($ids)
 ->map(fn ($id) => Entry::find($id))
 ->filter()
 ->each(fn ($entry) => $index->updateItem($entry));
 }

 public function handleFileChanges()
 {
 if ($this->fileChangesHandled || ! Stache::isWatcherEnabled()) {
Expand Down

30 changes: 27 additions & 3 deletions
tests/Data/Entries/CollectionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -865,17 +865,41 @@ public function it_gets_the_uri_and_url_from_the_mounted_entry()
 }

 #[Test]
 public function it_updates_entry_uris_through_the_repository()
 public function it_updates_entry_uris_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Collection::shouldReceive('updateEntryUris')->with($collection, null)->once()->ordered();
 Facades\Collection::shouldReceive('updateEntryUris')->with($collection, ['one', 'two'])->once()->ordered();
 Facades\Entry::shouldReceive('updateUris')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateUris')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryUris();
 $collection->updateEntryUris(['one', 'two']);
 }

 #[Test]
 public function it_updates_entry_orders_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Entry::shouldReceive('updateOrders')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateOrders')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryOrder();
 $collection->updateEntryOrder(['one', 'two']);
 }

 #[Test]
 public function it_updates_entry_parents_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Entry::shouldReceive('updateParents')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateParents')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryParent();
 $collection->updateEntryParent(['one', 'two']);
 }

 #[Test]
 #[DataProvider('additionalPreviewTargetProvider')]
 public function it_gets_and_sets_preview_targets($throughFacade)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[5.x] Move updating from collection repo to entry repo#10383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Jul 10, 2024
 Merged


[5.x] Move updating from collection repo to entry repo
#10383
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
893c9c0

move updating of entry uris from collection repo into entry repo


jasonvarga Jul 2, 2024
6a34353

wip


jasonvarga Jul 2, 2024
bc7ac3c

Merge branch '5.x' into collections-doing-stuff-entries-should-probab…


jasonvarga Jul 5, 2024
3009e2a

fix test


jasonvarga Jul 9, 2024
7930aca

wip


jasonvarga Jul 9, 2024
dbc7c64

Merge branch '5.x' into collections-doing-stuff-entries-should-probab…


jasonvarga Jul 10, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
src/Entries/Collection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -503,21 +503,21 @@ public function save()

 public function updateEntryUris($ids = null)
 {
 Facades\Collection::updateEntryUris($this, $ids);
 Facades\Entry::updateUris($this, $ids);

 return $this;
 }

 public function updateEntryOrder($ids = null)
 {
 Facades\Collection::updateEntryOrder($this, $ids);
 Facades\Entry::updateOrders($this, $ids);

 return $this;
 }

 public function updateEntryParent($ids = null)
 {
 Facades\Collection::updateEntryParent($this, $ids);
 Facades\Entry::updateParents($this, $ids);

 return $this;
 }
Expand Down

12 changes: 9 additions & 3 deletions
src/Stache/Repositories/CollectionRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Data\StoresScopedComputedFieldCallbacks;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Entry;
use Statamic\Stache\Stache;

class CollectionRepository implements RepositoryContract
Expand DownExpand Up@@ -96,19 +97,24 @@ public function delete(Collection $collection)
 $this->store->delete($collection);
 }

 /**
 * @deprecated Use Entry::updateUris($collection, $ids)
 */
 public function updateEntryUris(Collection $collection, $ids = null)
 {
$this->store->updateEntryUris($collection, $ids);
Entry::updateUris($collection, $ids);
 }

 /** @deprecated Use Entry::updateOrders($collection, $ids) */
 public function updateEntryOrder(Collection $collection, $ids = null)
 {
$this->store->updateEntryOrder($collection, $ids);
Entry::updateOrders($collection, $ids);
 }

 /** @deprecated Use Entry::updateParents($collection, $ids) */
 public function updateEntryParent(Collection $collection, $ids = null)
 {
$this->store->updateEntryParent($collection, $ids);
Entry::updateParents($collection, $ids);
 }

 public function whereStructured(): IlluminateCollection
Expand Down

15 changes: 15 additions & 0 deletions
src/Stache/Repositories/EntryRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,4 +163,19 @@ public function applySubstitutions($items)
 return $this->substitutionsById[$item->id()] ?? $item;
 });
 }

 public function updateUris($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateUris($ids);
 }

 public function updateOrders($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateOrders($ids);
 }

 public function updateParents($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateParents($ids);
 }
}

39 changes: 39 additions & 0 deletions
src/Stache/Stores/CollectionEntriesStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,4 +251,43 @@ public function withoutBlinkingEntryUris($callback)

 return $return;
 }

 public function updateUris($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('uri'), $ids);
 $this->updateEntriesWithinStore($ids);
 }

 public function updateOrders($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('order'), $ids);
 }

 public function updateParents($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('parent'), $ids);
 }

 private function updateEntriesWithinIndex($index, $ids)
 {
 if (empty($ids)) {
 return $index->update();
 }

 collect($ids)
 ->map(fn ($id) => Entry::find($id))
 ->filter()
 ->each(fn ($entry) => $index->updateItem($entry));
 }

 private function updateEntriesWithinStore($ids)
 {
 if (empty($ids)) {
 $ids = $this->paths()->keys();
 }

 $entries = $this->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $this->cacheItem($entry));
 }
}

49 changes: 0 additions & 49 deletions
src/Stache/Stores/CollectionsStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
namespace Statamic\Stache\Stores;

use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\Path;
use Statamic\Facades\Site;
use Statamic\Facades\Stache;
Expand DownExpand Up@@ -82,54 +81,6 @@ protected function getDefaultPublishState($data)
 return $value === 'published';
 }

 public function updateEntryUris($collection, $ids = null)
 {
 $store = Stache::store('entries')->store($collection->handle());
 $this->updateEntriesWithinIndex($store->index('uri'), $ids);
 $this->updateEntriesWithinStore($store, $ids);
 }

 private function updateEntriesWithinStore($store, $ids)
 {
 if (empty($ids)) {
 $ids = $store->paths()->keys();
 }

 $entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $store->cacheItem($entry));
 }

 public function updateEntryOrder($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('order');

 $this->updateEntriesWithinIndex($index, $ids);
 }

 public function updateEntryParent($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('parent');

 $this->updateEntriesWithinIndex($index, $ids);
 }

 private function updateEntriesWithinIndex($index, $ids)
 {
 if (empty($ids)) {
 return $index->update();
 }

 collect($ids)
 ->map(fn ($id) => Entry::find($id))
 ->filter()
 ->each(fn ($entry) => $index->updateItem($entry));
 }

 public function handleFileChanges()
 {
 if ($this->fileChangesHandled || ! Stache::isWatcherEnabled()) {
Expand Down

30 changes: 27 additions & 3 deletions
tests/Data/Entries/CollectionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -865,17 +865,41 @@ public function it_gets_the_uri_and_url_from_the_mounted_entry()
 }

 #[Test]
 public function it_updates_entry_uris_through_the_repository()
 public function it_updates_entry_uris_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Collection::shouldReceive('updateEntryUris')->with($collection, null)->once()->ordered();
 Facades\Collection::shouldReceive('updateEntryUris')->with($collection, ['one', 'two'])->once()->ordered();
 Facades\Entry::shouldReceive('updateUris')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateUris')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryUris();
 $collection->updateEntryUris(['one', 'two']);
 }

 #[Test]
 public function it_updates_entry_orders_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Entry::shouldReceive('updateOrders')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateOrders')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryOrder();
 $collection->updateEntryOrder(['one', 'two']);
 }

 #[Test]
 public function it_updates_entry_parents_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Entry::shouldReceive('updateParents')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateParents')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryParent();
 $collection->updateEntryParent(['one', 'two']);
 }

 #[Test]
 #[DataProvider('additionalPreviewTargetProvider')]
 public function it_gets_and_sets_preview_targets($throughFacade)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[5.x] Move updating from collection repo to entry repo#10383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Jul 10, 2024
 Merged


[5.x] Move updating from collection repo to entry repo
#10383
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
893c9c0

move updating of entry uris from collection repo into entry repo


jasonvarga Jul 2, 2024
6a34353

wip


jasonvarga Jul 2, 2024
bc7ac3c

Merge branch '5.x' into collections-doing-stuff-entries-should-probab…


jasonvarga Jul 5, 2024
3009e2a

fix test


jasonvarga Jul 9, 2024
7930aca

wip


jasonvarga Jul 9, 2024
dbc7c64

Merge branch '5.x' into collections-doing-stuff-entries-should-probab…


jasonvarga Jul 10, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
src/Entries/Collection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -503,21 +503,21 @@ public function save()

 public function updateEntryUris($ids = null)
 {
 Facades\Collection::updateEntryUris($this, $ids);
 Facades\Entry::updateUris($this, $ids);

 return $this;
 }

 public function updateEntryOrder($ids = null)
 {
 Facades\Collection::updateEntryOrder($this, $ids);
 Facades\Entry::updateOrders($this, $ids);

 return $this;
 }

 public function updateEntryParent($ids = null)
 {
 Facades\Collection::updateEntryParent($this, $ids);
 Facades\Entry::updateParents($this, $ids);

 return $this;
 }
Expand Down

12 changes: 9 additions & 3 deletions
src/Stache/Repositories/CollectionRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Data\StoresScopedComputedFieldCallbacks;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Entry;
use Statamic\Stache\Stache;

class CollectionRepository implements RepositoryContract
Expand DownExpand Up@@ -96,19 +97,24 @@ public function delete(Collection $collection)
 $this->store->delete($collection);
 }

 /**
 * @deprecated Use Entry::updateUris($collection, $ids)
 */
 public function updateEntryUris(Collection $collection, $ids = null)
 {
$this->store->updateEntryUris($collection, $ids);
Entry::updateUris($collection, $ids);
 }

 /** @deprecated Use Entry::updateOrders($collection, $ids) */
 public function updateEntryOrder(Collection $collection, $ids = null)
 {
$this->store->updateEntryOrder($collection, $ids);
Entry::updateOrders($collection, $ids);
 }

 /** @deprecated Use Entry::updateParents($collection, $ids) */
 public function updateEntryParent(Collection $collection, $ids = null)
 {
$this->store->updateEntryParent($collection, $ids);
Entry::updateParents($collection, $ids);
 }

 public function whereStructured(): IlluminateCollection
Expand Down

15 changes: 15 additions & 0 deletions
src/Stache/Repositories/EntryRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,4 +163,19 @@ public function applySubstitutions($items)
 return $this->substitutionsById[$item->id()] ?? $item;
 });
 }

 public function updateUris($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateUris($ids);
 }

 public function updateOrders($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateOrders($ids);
 }

 public function updateParents($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateParents($ids);
 }
}

39 changes: 39 additions & 0 deletions
src/Stache/Stores/CollectionEntriesStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,4 +251,43 @@ public function withoutBlinkingEntryUris($callback)

 return $return;
 }

 public function updateUris($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('uri'), $ids);
 $this->updateEntriesWithinStore($ids);
 }

 public function updateOrders($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('order'), $ids);
 }

 public function updateParents($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('parent'), $ids);
 }

 private function updateEntriesWithinIndex($index, $ids)
 {
 if (empty($ids)) {
 return $index->update();
 }

 collect($ids)
 ->map(fn ($id) => Entry::find($id))
 ->filter()
 ->each(fn ($entry) => $index->updateItem($entry));
 }

 private function updateEntriesWithinStore($ids)
 {
 if (empty($ids)) {
 $ids = $this->paths()->keys();
 }

 $entries = $this->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $this->cacheItem($entry));
 }
}

49 changes: 0 additions & 49 deletions
src/Stache/Stores/CollectionsStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
namespace Statamic\Stache\Stores;

use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\Path;
use Statamic\Facades\Site;
use Statamic\Facades\Stache;
Expand DownExpand Up@@ -82,54 +81,6 @@ protected function getDefaultPublishState($data)
 return $value === 'published';
 }

 public function updateEntryUris($collection, $ids = null)
 {
 $store = Stache::store('entries')->store($collection->handle());
 $this->updateEntriesWithinIndex($store->index('uri'), $ids);
 $this->updateEntriesWithinStore($store, $ids);
 }

 private function updateEntriesWithinStore($store, $ids)
 {
 if (empty($ids)) {
 $ids = $store->paths()->keys();
 }

 $entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $store->cacheItem($entry));
 }

 public function updateEntryOrder($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('order');

 $this->updateEntriesWithinIndex($index, $ids);
 }

 public function updateEntryParent($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('parent');

 $this->updateEntriesWithinIndex($index, $ids);
 }

 private function updateEntriesWithinIndex($index, $ids)
 {
 if (empty($ids)) {
 return $index->update();
 }

 collect($ids)
 ->map(fn ($id) => Entry::find($id))
 ->filter()
 ->each(fn ($entry) => $index->updateItem($entry));
 }

 public function handleFileChanges()
 {
 if ($this->fileChangesHandled || ! Stache::isWatcherEnabled()) {
Expand Down

30 changes: 27 additions & 3 deletions
tests/Data/Entries/CollectionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -865,17 +865,41 @@ public function it_gets_the_uri_and_url_from_the_mounted_entry()
 }

 #[Test]
 public function it_updates_entry_uris_through_the_repository()
 public function it_updates_entry_uris_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Collection::shouldReceive('updateEntryUris')->with($collection, null)->once()->ordered();
 Facades\Collection::shouldReceive('updateEntryUris')->with($collection, ['one', 'two'])->once()->ordered();
 Facades\Entry::shouldReceive('updateUris')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateUris')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryUris();
 $collection->updateEntryUris(['one', 'two']);
 }

 #[Test]
 public function it_updates_entry_orders_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Entry::shouldReceive('updateOrders')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateOrders')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryOrder();
 $collection->updateEntryOrder(['one', 'two']);
 }

 #[Test]
 public function it_updates_entry_parents_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Entry::shouldReceive('updateParents')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateParents')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryParent();
 $collection->updateEntryParent(['one', 'two']);
 }

 #[Test]
 #[DataProvider('additionalPreviewTargetProvider')]
 public function it_gets_and_sets_preview_targets($throughFacade)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[5.x] Move updating from collection repo to entry repo#10383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Jul 10, 2024
 Merged


[5.x] Move updating from collection repo to entry repo
#10383
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
893c9c0

move updating of entry uris from collection repo into entry repo


jasonvarga Jul 2, 2024
6a34353

wip


jasonvarga Jul 2, 2024
bc7ac3c

Merge branch '5.x' into collections-doing-stuff-entries-should-probab…


jasonvarga Jul 5, 2024
3009e2a

fix test


jasonvarga Jul 9, 2024
7930aca

wip


jasonvarga Jul 9, 2024
dbc7c64

Merge branch '5.x' into collections-doing-stuff-entries-should-probab…


jasonvarga Jul 10, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
src/Entries/Collection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -503,21 +503,21 @@ public function save()

 public function updateEntryUris($ids = null)
 {
 Facades\Collection::updateEntryUris($this, $ids);
 Facades\Entry::updateUris($this, $ids);

 return $this;
 }

 public function updateEntryOrder($ids = null)
 {
 Facades\Collection::updateEntryOrder($this, $ids);
 Facades\Entry::updateOrders($this, $ids);

 return $this;
 }

 public function updateEntryParent($ids = null)
 {
 Facades\Collection::updateEntryParent($this, $ids);
 Facades\Entry::updateParents($this, $ids);

 return $this;
 }
Expand Down

12 changes: 9 additions & 3 deletions
src/Stache/Repositories/CollectionRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Data\StoresScopedComputedFieldCallbacks;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Entry;
use Statamic\Stache\Stache;

class CollectionRepository implements RepositoryContract
Expand DownExpand Up@@ -96,19 +97,24 @@ public function delete(Collection $collection)
 $this->store->delete($collection);
 }

 /**
 * @deprecated Use Entry::updateUris($collection, $ids)
 */
 public function updateEntryUris(Collection $collection, $ids = null)
 {
$this->store->updateEntryUris($collection, $ids);
Entry::updateUris($collection, $ids);
 }

 /** @deprecated Use Entry::updateOrders($collection, $ids) */
 public function updateEntryOrder(Collection $collection, $ids = null)
 {
$this->store->updateEntryOrder($collection, $ids);
Entry::updateOrders($collection, $ids);
 }

 /** @deprecated Use Entry::updateParents($collection, $ids) */
 public function updateEntryParent(Collection $collection, $ids = null)
 {
$this->store->updateEntryParent($collection, $ids);
Entry::updateParents($collection, $ids);
 }

 public function whereStructured(): IlluminateCollection
Expand Down

15 changes: 15 additions & 0 deletions
src/Stache/Repositories/EntryRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,4 +163,19 @@ public function applySubstitutions($items)
 return $this->substitutionsById[$item->id()] ?? $item;
 });
 }

 public function updateUris($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateUris($ids);
 }

 public function updateOrders($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateOrders($ids);
 }

 public function updateParents($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateParents($ids);
 }
}

39 changes: 39 additions & 0 deletions
src/Stache/Stores/CollectionEntriesStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,4 +251,43 @@ public function withoutBlinkingEntryUris($callback)

 return $return;
 }

 public function updateUris($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('uri'), $ids);
 $this->updateEntriesWithinStore($ids);
 }

 public function updateOrders($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('order'), $ids);
 }

 public function updateParents($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('parent'), $ids);
 }

 private function updateEntriesWithinIndex($index, $ids)
 {
 if (empty($ids)) {
 return $index->update();
 }

 collect($ids)
 ->map(fn ($id) => Entry::find($id))
 ->filter()
 ->each(fn ($entry) => $index->updateItem($entry));
 }

 private function updateEntriesWithinStore($ids)
 {
 if (empty($ids)) {
 $ids = $this->paths()->keys();
 }

 $entries = $this->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $this->cacheItem($entry));
 }
}

49 changes: 0 additions & 49 deletions
src/Stache/Stores/CollectionsStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
namespace Statamic\Stache\Stores;

use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\Path;
use Statamic\Facades\Site;
use Statamic\Facades\Stache;
Expand DownExpand Up@@ -82,54 +81,6 @@ protected function getDefaultPublishState($data)
 return $value === 'published';
 }

 public function updateEntryUris($collection, $ids = null)
 {
 $store = Stache::store('entries')->store($collection->handle());
 $this->updateEntriesWithinIndex($store->index('uri'), $ids);
 $this->updateEntriesWithinStore($store, $ids);
 }

 private function updateEntriesWithinStore($store, $ids)
 {
 if (empty($ids)) {
 $ids = $store->paths()->keys();
 }

 $entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $store->cacheItem($entry));
 }

 public function updateEntryOrder($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('order');

 $this->updateEntriesWithinIndex($index, $ids);
 }

 public function updateEntryParent($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('parent');

 $this->updateEntriesWithinIndex($index, $ids);
 }

 private function updateEntriesWithinIndex($index, $ids)
 {
 if (empty($ids)) {
 return $index->update();
 }

 collect($ids)
 ->map(fn ($id) => Entry::find($id))
 ->filter()
 ->each(fn ($entry) => $index->updateItem($entry));
 }

 public function handleFileChanges()
 {
 if ($this->fileChangesHandled || ! Stache::isWatcherEnabled()) {
Expand Down

30 changes: 27 additions & 3 deletions
tests/Data/Entries/CollectionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -865,17 +865,41 @@ public function it_gets_the_uri_and_url_from_the_mounted_entry()
 }

 #[Test]
 public function it_updates_entry_uris_through_the_repository()
 public function it_updates_entry_uris_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Collection::shouldReceive('updateEntryUris')->with($collection, null)->once()->ordered();
 Facades\Collection::shouldReceive('updateEntryUris')->with($collection, ['one', 'two'])->once()->ordered();
 Facades\Entry::shouldReceive('updateUris')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateUris')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryUris();
 $collection->updateEntryUris(['one', 'two']);
 }

 #[Test]
 public function it_updates_entry_orders_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Entry::shouldReceive('updateOrders')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateOrders')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryOrder();
 $collection->updateEntryOrder(['one', 'two']);
 }

 #[Test]
 public function it_updates_entry_parents_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Entry::shouldReceive('updateParents')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateParents')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryParent();
 $collection->updateEntryParent(['one', 'two']);
 }

 #[Test]
 #[DataProvider('additionalPreviewTargetProvider')]
 public function it_gets_and_sets_preview_targets($throughFacade)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[5.x] Move updating from collection repo to entry repo#10383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Jul 10, 2024
 Merged


[5.x] Move updating from collection repo to entry repo
#10383
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
893c9c0

move updating of entry uris from collection repo into entry repo


jasonvarga Jul 2, 2024
6a34353

wip


jasonvarga Jul 2, 2024
bc7ac3c

Merge branch '5.x' into collections-doing-stuff-entries-should-probab…


jasonvarga Jul 5, 2024
3009e2a

fix test


jasonvarga Jul 9, 2024
7930aca

wip


jasonvarga Jul 9, 2024
dbc7c64

Merge branch '5.x' into collections-doing-stuff-entries-should-probab…


jasonvarga Jul 10, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
src/Entries/Collection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -503,21 +503,21 @@ public function save()

 public function updateEntryUris($ids = null)
 {
 Facades\Collection::updateEntryUris($this, $ids);
 Facades\Entry::updateUris($this, $ids);

 return $this;
 }

 public function updateEntryOrder($ids = null)
 {
 Facades\Collection::updateEntryOrder($this, $ids);
 Facades\Entry::updateOrders($this, $ids);

 return $this;
 }

 public function updateEntryParent($ids = null)
 {
 Facades\Collection::updateEntryParent($this, $ids);
 Facades\Entry::updateParents($this, $ids);

 return $this;
 }
Expand Down

12 changes: 9 additions & 3 deletions
src/Stache/Repositories/CollectionRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Data\StoresScopedComputedFieldCallbacks;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Entry;
use Statamic\Stache\Stache;

class CollectionRepository implements RepositoryContract
Expand DownExpand Up@@ -96,19 +97,24 @@ public function delete(Collection $collection)
 $this->store->delete($collection);
 }

 /**
 * @deprecated Use Entry::updateUris($collection, $ids)
 */
 public function updateEntryUris(Collection $collection, $ids = null)
 {
$this->store->updateEntryUris($collection, $ids);
Entry::updateUris($collection, $ids);
 }

 /** @deprecated Use Entry::updateOrders($collection, $ids) */
 public function updateEntryOrder(Collection $collection, $ids = null)
 {
$this->store->updateEntryOrder($collection, $ids);
Entry::updateOrders($collection, $ids);
 }

 /** @deprecated Use Entry::updateParents($collection, $ids) */
 public function updateEntryParent(Collection $collection, $ids = null)
 {
$this->store->updateEntryParent($collection, $ids);
Entry::updateParents($collection, $ids);
 }

 public function whereStructured(): IlluminateCollection
Expand Down

15 changes: 15 additions & 0 deletions
src/Stache/Repositories/EntryRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,4 +163,19 @@ public function applySubstitutions($items)
 return $this->substitutionsById[$item->id()] ?? $item;
 });
 }

 public function updateUris($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateUris($ids);
 }

 public function updateOrders($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateOrders($ids);
 }

 public function updateParents($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateParents($ids);
 }
}

39 changes: 39 additions & 0 deletions
src/Stache/Stores/CollectionEntriesStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,4 +251,43 @@ public function withoutBlinkingEntryUris($callback)

 return $return;
 }

 public function updateUris($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('uri'), $ids);
 $this->updateEntriesWithinStore($ids);
 }

 public function updateOrders($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('order'), $ids);
 }

 public function updateParents($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('parent'), $ids);
 }

 private function updateEntriesWithinIndex($index, $ids)
 {
 if (empty($ids)) {
 return $index->update();
 }

 collect($ids)
 ->map(fn ($id) => Entry::find($id))
 ->filter()
 ->each(fn ($entry) => $index->updateItem($entry));
 }

 private function updateEntriesWithinStore($ids)
 {
 if (empty($ids)) {
 $ids = $this->paths()->keys();
 }

 $entries = $this->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $this->cacheItem($entry));
 }
}

49 changes: 0 additions & 49 deletions
src/Stache/Stores/CollectionsStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
namespace Statamic\Stache\Stores;

use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\Path;
use Statamic\Facades\Site;
use Statamic\Facades\Stache;
Expand DownExpand Up@@ -82,54 +81,6 @@ protected function getDefaultPublishState($data)
 return $value === 'published';
 }

 public function updateEntryUris($collection, $ids = null)
 {
 $store = Stache::store('entries')->store($collection->handle());
 $this->updateEntriesWithinIndex($store->index('uri'), $ids);
 $this->updateEntriesWithinStore($store, $ids);
 }

 private function updateEntriesWithinStore($store, $ids)
 {
 if (empty($ids)) {
 $ids = $store->paths()->keys();
 }

 $entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $store->cacheItem($entry));
 }

 public function updateEntryOrder($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('order');

 $this->updateEntriesWithinIndex($index, $ids);
 }

 public function updateEntryParent($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('parent');

 $this->updateEntriesWithinIndex($index, $ids);
 }

 private function updateEntriesWithinIndex($index, $ids)
 {
 if (empty($ids)) {
 return $index->update();
 }

 collect($ids)
 ->map(fn ($id) => Entry::find($id))
 ->filter()
 ->each(fn ($entry) => $index->updateItem($entry));
 }

 public function handleFileChanges()
 {
 if ($this->fileChangesHandled || ! Stache::isWatcherEnabled()) {
Expand Down

30 changes: 27 additions & 3 deletions
tests/Data/Entries/CollectionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -865,17 +865,41 @@ public function it_gets_the_uri_and_url_from_the_mounted_entry()
 }

 #[Test]
 public function it_updates_entry_uris_through_the_repository()
 public function it_updates_entry_uris_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Collection::shouldReceive('updateEntryUris')->with($collection, null)->once()->ordered();
 Facades\Collection::shouldReceive('updateEntryUris')->with($collection, ['one', 'two'])->once()->ordered();
 Facades\Entry::shouldReceive('updateUris')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateUris')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryUris();
 $collection->updateEntryUris(['one', 'two']);
 }

 #[Test]
 public function it_updates_entry_orders_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Entry::shouldReceive('updateOrders')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateOrders')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryOrder();
 $collection->updateEntryOrder(['one', 'two']);
 }

 #[Test]
 public function it_updates_entry_parents_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Entry::shouldReceive('updateParents')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateParents')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryParent();
 $collection->updateEntryParent(['one', 'two']);
 }

 #[Test]
 #[DataProvider('additionalPreviewTargetProvider')]
 public function it_gets_and_sets_preview_targets($throughFacade)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[5.x] Move updating from collection repo to entry repo#10383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Jul 10, 2024
 Merged


[5.x] Move updating from collection repo to entry repo
#10383
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
893c9c0

move updating of entry uris from collection repo into entry repo


jasonvarga Jul 2, 2024
6a34353

wip


jasonvarga Jul 2, 2024
bc7ac3c

Merge branch '5.x' into collections-doing-stuff-entries-should-probab…


jasonvarga Jul 5, 2024
3009e2a

fix test


jasonvarga Jul 9, 2024
7930aca

wip


jasonvarga Jul 9, 2024
dbc7c64

Merge branch '5.x' into collections-doing-stuff-entries-should-probab…


jasonvarga Jul 10, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
src/Entries/Collection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -503,21 +503,21 @@ public function save()

 public function updateEntryUris($ids = null)
 {
 Facades\Collection::updateEntryUris($this, $ids);
 Facades\Entry::updateUris($this, $ids);

 return $this;
 }

 public function updateEntryOrder($ids = null)
 {
 Facades\Collection::updateEntryOrder($this, $ids);
 Facades\Entry::updateOrders($this, $ids);

 return $this;
 }

 public function updateEntryParent($ids = null)
 {
 Facades\Collection::updateEntryParent($this, $ids);
 Facades\Entry::updateParents($this, $ids);

 return $this;
 }
Expand Down

12 changes: 9 additions & 3 deletions
src/Stache/Repositories/CollectionRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Data\StoresScopedComputedFieldCallbacks;
use Statamic\Exceptions\CollectionNotFoundException;
use Statamic\Facades\Blink;
use Statamic\Facades\Entry;
use Statamic\Stache\Stache;

class CollectionRepository implements RepositoryContract
Expand DownExpand Up@@ -96,19 +97,24 @@ public function delete(Collection $collection)
 $this->store->delete($collection);
 }

 /**
 * @deprecated Use Entry::updateUris($collection, $ids)
 */
 public function updateEntryUris(Collection $collection, $ids = null)
 {
$this->store->updateEntryUris($collection, $ids);
Entry::updateUris($collection, $ids);
 }

 /** @deprecated Use Entry::updateOrders($collection, $ids) */
 public function updateEntryOrder(Collection $collection, $ids = null)
 {
$this->store->updateEntryOrder($collection, $ids);
Entry::updateOrders($collection, $ids);
 }

 /** @deprecated Use Entry::updateParents($collection, $ids) */
 public function updateEntryParent(Collection $collection, $ids = null)
 {
$this->store->updateEntryParent($collection, $ids);
Entry::updateParents($collection, $ids);
 }

 public function whereStructured(): IlluminateCollection
Expand Down

15 changes: 15 additions & 0 deletions
src/Stache/Repositories/EntryRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,4 +163,19 @@ public function applySubstitutions($items)
 return $this->substitutionsById[$item->id()] ?? $item;
 });
 }

 public function updateUris($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateUris($ids);
 }

 public function updateOrders($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateOrders($ids);
 }

 public function updateParents($collection, $ids = null)
 {
 $this->store->store($collection->handle())->updateParents($ids);
 }
}

39 changes: 39 additions & 0 deletions
src/Stache/Stores/CollectionEntriesStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,4 +251,43 @@ public function withoutBlinkingEntryUris($callback)

 return $return;
 }

 public function updateUris($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('uri'), $ids);
 $this->updateEntriesWithinStore($ids);
 }

 public function updateOrders($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('order'), $ids);
 }

 public function updateParents($ids = null)
 {
 $this->updateEntriesWithinIndex($this->index('parent'), $ids);
 }

 private function updateEntriesWithinIndex($index, $ids)
 {
 if (empty($ids)) {
 return $index->update();
 }

 collect($ids)
 ->map(fn ($id) => Entry::find($id))
 ->filter()
 ->each(fn ($entry) => $index->updateItem($entry));
 }

 private function updateEntriesWithinStore($ids)
 {
 if (empty($ids)) {
 $ids = $this->paths()->keys();
 }

 $entries = $this->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $this->cacheItem($entry));
 }
}

49 changes: 0 additions & 49 deletions
src/Stache/Stores/CollectionsStore.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
namespace Statamic\Stache\Stores;

use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\Path;
use Statamic\Facades\Site;
use Statamic\Facades\Stache;
Expand DownExpand Up@@ -82,54 +81,6 @@ protected function getDefaultPublishState($data)
 return $value === 'published';
 }

 public function updateEntryUris($collection, $ids = null)
 {
 $store = Stache::store('entries')->store($collection->handle());
 $this->updateEntriesWithinIndex($store->index('uri'), $ids);
 $this->updateEntriesWithinStore($store, $ids);
 }

 private function updateEntriesWithinStore($store, $ids)
 {
 if (empty($ids)) {
 $ids = $store->paths()->keys();
 }

 $entries = $store->withoutBlinkingEntryUris(fn () => collect($ids)->map(fn ($id) => Entry::find($id))->filter());

 $entries->each(fn ($entry) => $store->cacheItem($entry));
 }

 public function updateEntryOrder($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('order');

 $this->updateEntriesWithinIndex($index, $ids);
 }

 public function updateEntryParent($collection, $ids = null)
 {
 $index = Stache::store('entries')
 ->store($collection->handle())
 ->index('parent');

 $this->updateEntriesWithinIndex($index, $ids);
 }

 private function updateEntriesWithinIndex($index, $ids)
 {
 if (empty($ids)) {
 return $index->update();
 }

 collect($ids)
 ->map(fn ($id) => Entry::find($id))
 ->filter()
 ->each(fn ($entry) => $index->updateItem($entry));
 }

 public function handleFileChanges()
 {
 if ($this->fileChangesHandled || ! Stache::isWatcherEnabled()) {
Expand Down

30 changes: 27 additions & 3 deletions
tests/Data/Entries/CollectionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -865,17 +865,41 @@ public function it_gets_the_uri_and_url_from_the_mounted_entry()
 }

 #[Test]
 public function it_updates_entry_uris_through_the_repository()
 public function it_updates_entry_uris_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Collection::shouldReceive('updateEntryUris')->with($collection, null)->once()->ordered();
 Facades\Collection::shouldReceive('updateEntryUris')->with($collection, ['one', 'two'])->once()->ordered();
 Facades\Entry::shouldReceive('updateUris')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateUris')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryUris();
 $collection->updateEntryUris(['one', 'two']);
 }

 #[Test]
 public function it_updates_entry_orders_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Entry::shouldReceive('updateOrders')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateOrders')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryOrder();
 $collection->updateEntryOrder(['one', 'two']);
 }

 #[Test]
 public function it_updates_entry_parents_through_the_entry_repository()
 {
 $collection = (new Collection)->handle('test');

 Facades\Entry::shouldReceive('updateParents')->with($collection, null)->once()->ordered();
 Facades\Entry::shouldReceive('updateParents')->with($collection, ['one', 'two'])->once()->ordered();

 $collection->updateEntryParent();
 $collection->updateEntryParent(['one', 'two']);
 }

 #[Test]
 #[DataProvider('additionalPreviewTargetProvider')]
 public function it_gets_and_sets_preview_targets($throughFacade)
Expand Down