From 43dfe29f63ca66f3ab5d3197248ac59a40e2f8bc Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Thu, 29 Jan 2026 11:19:06 +0000 Subject: [PATCH 1/5] Search instructions when searching sets --- resources/js/components/fieldtypes/replicator/SetPicker.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/js/components/fieldtypes/replicator/SetPicker.vue b/resources/js/components/fieldtypes/replicator/SetPicker.vue index 344f43c237..9ddf854a10 100644 --- a/resources/js/components/fieldtypes/replicator/SetPicker.vue +++ b/resources/js/components/fieldtypes/replicator/SetPicker.vue @@ -268,6 +268,7 @@ export default { .filter((set) => { return ( __(set.display).toLowerCase().includes(this.search.toLowerCase()) || + __(set.instructions)?.toLowerCase().includes(this.search.toLowerCase()) || set.handle.toLowerCase().includes(this.search.toLowerCase()) ); }); From fb291e68eac367febb3657de9033d91dc74fd34a Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Thu, 29 Jan 2026 12:14:25 -0500 Subject: [PATCH 2/5] filter in grid mode --- resources/js/components/fieldtypes/replicator/SetPicker.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/js/components/fieldtypes/replicator/SetPicker.vue b/resources/js/components/fieldtypes/replicator/SetPicker.vue index 9ddf854a10..930bb687a6 100644 --- a/resources/js/components/fieldtypes/replicator/SetPicker.vue +++ b/resources/js/components/fieldtypes/replicator/SetPicker.vue @@ -321,6 +321,7 @@ export default { filteredSets = filteredSets.filter(set => { return ( __(set.display).toLowerCase().includes(this.search.toLowerCase()) || + __(set.instructions)?.toLowerCase().includes(this.search.toLowerCase()) || set.handle.toLowerCase().includes(this.search.toLowerCase()) ); }); From e5ac11b5c974d08ef9e057a9377374601d2062ca Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Thu, 29 Jan 2026 12:17:32 -0500 Subject: [PATCH 3/5] avoid filtering by hide twice --- resources/js/components/fieldtypes/replicator/SetPicker.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/js/components/fieldtypes/replicator/SetPicker.vue b/resources/js/components/fieldtypes/replicator/SetPicker.vue index 930bb687a6..298cc23cfd 100644 --- a/resources/js/components/fieldtypes/replicator/SetPicker.vue +++ b/resources/js/components/fieldtypes/replicator/SetPicker.vue @@ -263,8 +263,7 @@ export default { }, []); if (this.search) { - return sets - .filter((set) => !set.hide) + sets = sets .filter((set) => { return ( __(set.display).toLowerCase().includes(this.search.toLowerCase()) || From a3a93672b86aca37f4c4a11832d410e6c812bbc5 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Thu, 29 Jan 2026 12:19:11 -0500 Subject: [PATCH 4/5] extract method --- .../fieldtypes/replicator/SetPicker.vue | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/resources/js/components/fieldtypes/replicator/SetPicker.vue b/resources/js/components/fieldtypes/replicator/SetPicker.vue index 298cc23cfd..fe45673ad3 100644 --- a/resources/js/components/fieldtypes/replicator/SetPicker.vue +++ b/resources/js/components/fieldtypes/replicator/SetPicker.vue @@ -263,14 +263,7 @@ export default { }, []); if (this.search) { - sets = sets - .filter((set) => { - return ( - __(set.display).toLowerCase().includes(this.search.toLowerCase()) || - __(set.instructions)?.toLowerCase().includes(this.search.toLowerCase()) || - set.handle.toLowerCase().includes(this.search.toLowerCase()) - ); - }); + sets = this.filterSetsBySearch(sets); } return sets.filter((set) => !set.hide); @@ -317,13 +310,7 @@ export default { // Apply search filter if there's a search term if (this.search) { - filteredSets = filteredSets.filter(set => { - return ( - __(set.display).toLowerCase().includes(this.search.toLowerCase()) || - __(set.instructions)?.toLowerCase().includes(this.search.toLowerCase()) || - set.handle.toLowerCase().includes(this.search.toLowerCase()) - ); - }); + filteredSets = this.filterSetsBySearch(filteredSets); } groups[group.handle] = { @@ -480,6 +467,16 @@ export default { isSetLoading(handle) { return this.loadingSet === handle; }, + + filterSetsBySearch(sets) { + return sets.filter(set => { + return ( + __(set.display).toLowerCase().includes(this.search.toLowerCase()) || + __(set.instructions)?.toLowerCase().includes(this.search.toLowerCase()) || + set.handle.toLowerCase().includes(this.search.toLowerCase()) + ); + }); + } }, }; From 45347d6b107540eacefc81f55d56c6338969aecc Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Thu, 29 Jan 2026 12:23:34 -0500 Subject: [PATCH 5/5] use fuzzy sort. give instructions lower priority --- .../fieldtypes/replicator/SetPicker.vue | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/resources/js/components/fieldtypes/replicator/SetPicker.vue b/resources/js/components/fieldtypes/replicator/SetPicker.vue index fe45673ad3..a301ea4f76 100644 --- a/resources/js/components/fieldtypes/replicator/SetPicker.vue +++ b/resources/js/components/fieldtypes/replicator/SetPicker.vue @@ -193,6 +193,7 @@ body:has(:is(.bard-fullscreen, .replicator-fullscreen)) [data-reka-popper-conten