Skip to content

fix(search): allow author name search in editorial dashboard for user… #12416

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

Open
MrRob100 wants to merge 3 commits into
base: stable-3_4_0
Choose a base branch
from
Open

fix(search): allow author name search in editorial dashboard for user… #12416

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91d32dc
fix(search): allow author name search in editorial dashboard for user…
MrRob100 Mar 4, 2026
b5eebae
Merge branch 'stable-3_4_0' into my-queue-search-fix
MrRob100 Mar 19, 2026
db21e1a
better fix for my queue search
MrRob100 Mar 19, 2026
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
63 changes: 41 additions & 22 deletions classes/submission/Collector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
use PKP\plugins\Hook;
use PKP\search\SubmissionSearch;
use PKP\security\Role;
use PKP\submission\reviewAssignment\ReviewAssignment;
use PKP\submission\reviewRound\ReviewRound;

/**
Expand Down Expand Up @@ -62,6 +63,7 @@ abstract class Collector implements CollectorInterface
public string $orderDirection = 'DESC';
public ?string $searchPhrase = null;
public ?int $maxSearchKeywords = null;

public ?array $statuses = null;
public ?array $stageIds = null;
public ?array $doiStatuses = null;
Expand Down Expand Up @@ -463,20 +465,9 @@ public function getQueryBuilder(): Builder
// Search phrase
if ($keywords->count()) {
$likePattern = DB::raw("CONCAT('%', LOWER(?), '%')");
if (!empty($this->assignedTo)) {
// Holds a single random row to check whether we have any assignment
$q->leftJoinSub(
fn (Builder $q) => $q
->from('review_assignments', 'ra')
->whereIn('ra.reviewer_id', $this->assignedTo == self::UNASSIGNED ? [] : (array) $this->assignedTo)
->select(DB::raw('1 AS value'))
->limit(1),
'any_assignment',
'any_assignment.value',
'=',
DB::raw('1')
);
}
$assignedToIds = !empty($this->assignedTo) && $this->assignedTo !== self::UNASSIGNED
? (array) $this->assignedTo
: [];
// Builds the filters
$q->where(
fn (Builder $q) => $keywords
Expand All @@ -490,14 +481,28 @@ public function getQueryBuilder(): Builder
->join('submission_search_keyword_list AS sskl', 'sskl.keyword_id', '=', 'ssok.keyword_id')
->where('sskl.keyword_text', '=', DB::raw('LOWER(?)'))->addBinding($keyword)
->whereColumn('s.submission_id', '=', 'sso.submission_id')
// Don't permit reviewers to search on author names
// Don't permit double-blind reviewers to search on author names
->when(
!empty($this->assignedTo),
!empty($assignedToIds),
fn (Builder $q) => $q
->where(
fn (Builder $q) => $q
->whereNull('any_assignment.value')
->orWhere('sso.type', '!=', SubmissionSearch::SUBMISSION_SEARCH_AUTHOR)
->where('sso.type', '!=', SubmissionSearch::SUBMISSION_SEARCH_AUTHOR)
// Allow if user has a stage assignment on this submission
->orWhereExists(
fn (Builder $q) => $q
->from('stage_assignments', 'sa_search')
->whereColumn('sa_search.submission_id', '=', 'sso.submission_id')
->whereIn('sa_search.user_id', $assignedToIds)
)
// Allow if user has no double-blind review on this submission
->orWhereNotExists(
fn (Builder $q) => $q
->from('review_assignments', 'ra_search')
->whereColumn('ra_search.submission_id', '=', 'sso.submission_id')
->whereIn('ra_search.reviewer_id', $assignedToIds)
->where('ra_search.review_method', '=', ReviewAssignment::SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS)
)
)
)
)
Expand All @@ -524,17 +529,31 @@ public function getQueryBuilder(): Builder
Identity::IDENTITY_SETTING_FAMILYNAME,
'orcid'
])
// Don't permit reviewers to search on author names
// Don't permit double-blind reviewers to search on author names
->when(
!empty($this->assignedTo),
!empty($assignedToIds),
fn (Builder $q) => $q
->where(
fn (Builder $q) => $q
->whereNull('any_assignment.value')
->orWhereNotIn('aus.setting_name', [
->whereNotIn('aus.setting_name', [
Identity::IDENTITY_SETTING_GIVENNAME,
Identity::IDENTITY_SETTING_FAMILYNAME
])
// Allow if user has a stage assignment on this submission
->orWhereExists(
fn (Builder $q) => $q
->from('stage_assignments', 'sa_search2')
->whereColumn('sa_search2.submission_id', '=', 'p.submission_id')
->whereIn('sa_search2.user_id', $assignedToIds)
)
// Allow if user has no double-blind review on this submission
->orWhereNotExists(
fn (Builder $q) => $q
->from('review_assignments', 'ra_search2')
->whereColumn('ra_search2.submission_id', '=', 'p.submission_id')
->whereIn('ra_search2.reviewer_id', $assignedToIds)
->where('ra_search2.review_method', '=', ReviewAssignment::SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS)
)
)
)
->where(DB::raw('LOWER(aus.setting_value)'), 'LIKE', $likePattern)
Expand Down