4 Commits

Author SHA1 Message Date
central-worker-1
332551e2e3 The participants picker is sorted by the name it shows (#1706)
QA on [central-ticketing] #1598, reading the dropdown back after the
picker became chips: typing `an` listed "Toews, Fast, Ivanov, Mwangi,
Bergman, Anderson" — to an operator, no order at all.

It was in fact perfectly ordered. `searchUsers()` came out of #1598's
chip conversion with `->orderBy('name')`, and `users.name` is the cached
"First Last" ("Abigail Toews", "Andrew Fast", "Avery Ivanov") — the one
string a chip row no longer prints. A list labelled "Last, First" and
collated by "First Last" reads as unsorted, which is #524's own reported
defect; the sibling conversion on [central-staff-employment] #1597 names
it as the thing it had to fix at the same moment.

So the collation moves with the label: `PersonNames::orderUsers()`, the
platform's single answer, which the reference search
(`admin.settings.users.search`) and the other chipped pickers already
use, and which honours the operator's `name_format` rather than assuming
surname-first.

Not cosmetic: the sort runs before `limit(10)`, so on a common surname
the two collations offer a different set of people, not the same set
shuffled.

Three tests in the shell suite (TicketParticipantsAreChipsTest) — the
collation, the `name_format` setting, and which ten survive the limit.
The first and third are red against `orderBy('name')`.
2026-09-11 13:47:08 -07:00
central-worker-4
c492becbdb The participants picker searches, and answers, in chips (#1598)
The operator, 11:46 PDT 2026-09-10, having just had the device picker
converted: "are there other places we can search users where we're not
using the chips? please go through and check." The lead's audit found ten
person searches on the platform — four drawing chips, six not — and this
is central-ticketing's.

`ticketing.users.search` answered `DB::table('users')->get(['id', 'name',
'email'])`, and `show()` handed the Participants card the same three
columns for the submitter and for everybody already on the ticket. So the
one card on this page that is entirely about WHO SOMEBODY IS drew three
text rows in three different shapes: a name over an address in the
dropdown, a name-or-address string per participant, and a third spelling
for the submitter. An agent adding a participant to a ticket about a
child chooses between the child and the parent of the same surname with
no role dot to tell them apart.

And it was worse than untidy. Name and email were the SHIPPED DEFAULT for
a chip, so a school that configured the student chip to grade + homeroom
kept being shown an address here — on the one people surface the
operator's own setting could not reach. That is the defect #871 exists to
remove, and this endpoint was still carrying it.

Both halves now go through `PersonChip::rows()`, so what a row SAYS is
the setting rather than a select list in this file, and the person PICKED
is byte-for-byte the person picked FROM — one serializer, one answer. The
search's payload is now the same, key for key, as
`admin.settings.users.search`; the test compares the two endpoints against
each other rather than against a literal list, because a literal passes on
the day it is written and then lets this surface fall behind the next key
the shared row grows.

`PersonChip::columns()` is the select list, not `['id', 'name', 'email']`:
a chip line may name any user column, and a constrained select hands the
helper a model whose attribute is simply ABSENT — which it cannot tell
from a person who has no value, so the line goes blank for everybody with
nothing failing.

`rows()` and NOT the model, in `show()`. That map also feeds the message
bylines and the assignee, so handing the page a `User` would put every
column of `users` — `preferred_pin`, `preferred_password`,
`date_of_birth` — in front of any agent who opens a ticket. `rows()` is
`{id, name, email, person}` and `person` is the curated allow-list. There
is a test that a PIN cannot reach the page.

WHO IS SEARCHABLE DOES NOT CHANGE, per the card. Same two-character
floor, same name-or-email `like`, same limit of 10, same exclusion of the
people already on the ticket, same agent gate; `User` carries no global
scope or soft delete `DB::table('users')` did not. The name-or-email
clause stays inside its own closure on purpose — flattened beside the
exclusion it is `(name) OR (email AND NOT IN)` by SQL's own precedence,
so a name match jumps the exclusion, which is the hole the same conversion
opened on [central-inventory] #1594. `orderBy('name')` is the one visible
difference and it is new: the old query had no order at all, so the same
two letters could list the same ten people differently twice running.

The Vue half, the source guard and the feature tests are on
dashboard-shell's branch of the same name.
2026-09-10 12:34:50 -07:00
central-worker-2
2b6d9b1651 Deleting a merge target un-merges what was folded into it (#1567)
`tickets.merged_into_id` is `nullOnDelete()` and `destroy()` was a one-liner, so
deleting the surviving ticket of a merge blanked the pointer on every ticket
merged into it and left `status = 'merged'` behind. The row that came out was
read-only for good (#920 guards on the status), carried a banner naming a ticket
that no longer existed, reported `merged_inconsistent = false` — the flag that
exists to catch exactly this — and dropped out of the Merged view, which was
scoped by the pointer, leaving it visible only under Resolved.

`StrandedMerge::handleTargetDeletion()` runs inside destroy()'s transaction,
before the row goes: sources are RE-POINTED at the doomed ticket's own merge
target when it has one (the messages really did travel that far up the chain),
otherwise UN-MERGED to `closed` — out of the work queues, as they were, but
editable, reopenable and answerable again — with a system note naming what was
deleted and why. #938's dangling pointers are simply cleared: those rows are
somebody's open work. The flash names every ticket that changed, and the delete
confirm names them before the click instead of the generic "cannot be undone".

The shape prod already holds gets a name: `scopeStrandedMerge()`, reported as
`merged_inconsistent` (now the union of both broken shapes) plus
`merged_stranded` so a page can tell which fix to offer, listed by the Merged
view via `scopeEverMerged()`, and released one at a time by `unmerge`. #938's
repair scope is deliberately untouched — it writes `status = 'merged'`, which a
stranded row already has, and matching it would break its idempotency.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-09-10 05:36:07 -07:00
central-worker-3
5eb2ec7bcf The Unassigned queue stops offering merged tickets as work (#1054)
The count and the list were the same question spelled two ways in one
method: the sidebar counts scope by $closedSlugs, read from
ticketing_statuses, while the `unassigned` and `mine` list branches
carried a hand-written ["resolved", "closed"] that predates the `merged`
status. So a correctly merged ticket — status merged, merged_into_id set,
its own Show page already calling it read-only — stayed in the queue
agents pull new work from, and the page contradicted itself on screen:
"Unassigned 4" beside five rendered rows.

Both queues now scope by $closedSlugs, so they exclude exactly what their
own counts exclude. The scoping is by STATUS and not by merged_into_id on
purpose: #938 rows (pointer set, status still open) are live, editable
work until a human repairs them, and dropping them out of the queue would
hide the rows that most need one. There is a NEGCTRL test for that.

Also, the secondary finding: ?filter=closed was accepted, silently
returned the All-Open set and was echoed back in props.filters as though
a Closed view existed. The sidebar has six views and that is not one of
them, so an unrecognised filter normalises to `all` and says so. The list
is now a constant that savePrefs() validates against too, rather than the
same six slugs written out twice.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-09-04 15:06:02 -07:00
4 changed files with 579 additions and 21 deletions

View File

@@ -3,6 +3,9 @@
namespace Dashboard\Ticketing\Http\Controllers; namespace Dashboard\Ticketing\Http\Controllers;
use App\Models\Setting; use App\Models\Setting;
use App\Models\User;
use App\Support\PersonChip;
use App\Support\PersonNames;
use Dashboard\Ticketing\Models\PriorityLevel; use Dashboard\Ticketing\Models\PriorityLevel;
use Dashboard\Ticketing\Models\Ticket; use Dashboard\Ticketing\Models\Ticket;
use Dashboard\Ticketing\Models\TicketAttachment; use Dashboard\Ticketing\Models\TicketAttachment;
@@ -14,6 +17,7 @@ use Dashboard\Ticketing\Models\TicketParticipant;
use Dashboard\Ticketing\Models\TicketStatus; use Dashboard\Ticketing\Models\TicketStatus;
use Dashboard\Ticketing\Models\TicketView; use Dashboard\Ticketing\Models\TicketView;
use Dashboard\Ticketing\Support\MergedTicketRepair; use Dashboard\Ticketing\Support\MergedTicketRepair;
use Dashboard\Ticketing\Support\StrandedMerge;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Routing\Controller; use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
@@ -24,6 +28,13 @@ use Inertia\Response;
class TicketController extends Controller class TicketController extends Controller
{ {
/**
* The sidebar's views, and the only values `?filter=` means anything as.
* Index.vue's `visibleViews` draws exactly these; `savePrefs()` validates
* against them; `index()` normalises anything else to `all` (#1054).
*/
private const VIEW_FILTERS = ['all', 'mine', 'unassigned', 'pending', 'resolved', 'merged'];
private function agentGroupIds(): array private function agentGroupIds(): array
{ {
return TicketingAgentAccess::where('user_id', Auth::id()) return TicketingAgentAccess::where('user_id', Auth::id())
@@ -112,6 +123,18 @@ class TicketController extends Controller
$request->merge(['filter' => $pref['filter']]); $request->merge(['filter' => $pref['filter']]);
} }
// #1054 — a `filter` the sidebar has no view for used to fall through to
// the All Open branch and then be echoed straight back in `props.filters`,
// so `?filter=closed` looked like a real view that just happened to be
// showing open tickets. There is no Closed view anywhere in the UI;
// anything unrecognised is All Open, and now says so. The list is the
// one `savePrefs()` validates against and the one Index.vue draws.
// Only rewrites a filter that was actually asked for: an absent one keeps
// meaning "no view chosen", which is what leaves `filter` out of the URL.
if ($request->filled('filter') && ! in_array($request->filter, self::VIEW_FILTERS, true)) {
$request->merge(['filter' => 'all']);
}
// If no groups exist at all, render a first-run / bootstrap state // If no groups exist at all, render a first-run / bootstrap state
$totalGroups = TicketingGroup::count(); $totalGroups = TicketingGroup::count();
if ($totalGroups === 0) { if ($totalGroups === 0) {
@@ -150,9 +173,11 @@ class TicketController extends Controller
'resolved' => (clone $baseQuery)->whereIn('status', $closedSlugs)->count(), 'resolved' => (clone $baseQuery)->whereIn('status', $closedSlugs)->count(),
// #938: the pointer, not the status — this view exists to show the // #938: the pointer, not the status — this view exists to show the
// rows where the two disagree, so filtering by `status = merged` // rows where the two disagree, so filtering by `status = merged`
// would hide exactly the ones worth looking at. // would hide exactly the ones worth looking at. #1567: nor is the
'merged' => (clone $baseQuery)->whereNotNull('merged_into_id')->count(), // pointer alone enough, because a stranded row has neither a
'merged_inconsistent' => (clone $baseQuery)->inconsistentlyMerged()->count(), // target nor a disagreeing status. Either mark of a merge counts.
'merged' => (clone $baseQuery)->everMerged()->count(),
'merged_inconsistent' => (clone $baseQuery)->mergeInconsistent()->count(),
] ]
: [ : [
'all' => (clone $baseQuery)->count(), 'all' => (clone $baseQuery)->count(),
@@ -181,10 +206,20 @@ class TicketController extends Controller
if ($request->filled('project_id')) { if ($request->filled('project_id')) {
$query->where('project_id', $request->project_id); $query->where('project_id', $request->project_id);
} }
// #1054 — the work queues scope by `$closedSlugs`, the same list the
// counts above use. They used to spell it `['resolved', 'closed']`
// by hand, which predates the `merged` status: a correctly merged
// ticket stayed in Unassigned as pickable work while the sidebar
// count next to it — already reading `$closedSlugs` — excluded it,
// so the view disagreed with its own header (4 vs 5). Scoping by
// STATUS and not by `merged_into_id` is deliberate: #938's
// inconsistent rows (pointer set, status still open) are live work
// until somebody repairs them, and hiding them from the queue would
// hide the rows that most need a human.
if ($request->filter === 'mine') { if ($request->filter === 'mine') {
$query->where('assigned_to', $user->id)->whereNotIn('status', ['resolved', 'closed']); $query->where('assigned_to', $user->id)->whereNotIn('status', $closedSlugs);
} elseif ($request->filter === 'unassigned') { } elseif ($request->filter === 'unassigned') {
$query->whereNull('assigned_to')->whereNotIn('status', ['resolved', 'closed']); $query->whereNull('assigned_to')->whereNotIn('status', $closedSlugs);
} elseif ($request->filter === 'pending') { } elseif ($request->filter === 'pending') {
$query->where('status', 'pending'); $query->where('status', 'pending');
} elseif ($request->filter === 'resolved') { } elseif ($request->filter === 'resolved') {
@@ -194,7 +229,13 @@ class TicketController extends Controller
// status says — which is what makes this the place the office // status says — which is what makes this the place the office
// finds the rows #938 is about. `merged` is a closed slug, so the // finds the rows #938 is about. `merged` is a closed slug, so the
// whereNotIn below would drop the consistent half of the list. // whereNotIn below would drop the consistent half of the list.
$query->whereNotNull('merged_into_id'); //
// #1567 — and whatever its POINTER says, too. Scoping by the
// pointer alone dropped a ticket whose merge target had been
// deleted out of this view entirely (n went 1 → 0 on the delete),
// leaving it visible only under Resolved: the rows most in need of
// a human were the ones the view could not show.
$query->everMerged();
} elseif (!$request->filled('status')) { } elseif (!$request->filled('status')) {
$query->whereNotIn('status', $closedSlugs); $query->whereNotIn('status', $closedSlugs);
} }
@@ -430,7 +471,39 @@ class TicketController extends Controller
->push($ticket->submitter_id) ->push($ticket->submitter_id)
->push($ticket->assigned_to) ->push($ticket->assigned_to)
->filter()->unique(); ->filter()->unique();
$users = DB::table('users')->whereIn('id', $userIds)->get(['id', 'name', 'email'])->keyBy('id'); /*
* EVERY PERSON ON THIS PAGE, IN THE PLATFORM'S ROW SHAPE (#1598).
*
* This was `DB::table('users')->get(['id', 'name', 'email'])`, and the
* Participants card it feeds drew each of those as
* `{{ p.user?.name || p.user?.email }}` — a bare text row where the rest
* of the platform draws a chip. `PersonChip::rows()` is the shared
* serializer, so what those rows SAY is the operator's chip setting
* rather than this method's select list, and it is the same payload the
* participant SEARCH answers with: the person picked and the row they
* were picked from cannot disagree about what they are called.
*
* `rows()` AND NOT THE MODEL. This map also feeds the message bylines
* and the assignee, so a `User` handed straight to Inertia would put
* every column of `users` — `preferred_pin`, `preferred_password`,
* `date_of_birth` — on the page for anybody who has ever replied to a
* ticket. `rows()` is exactly `{id, name, email, person}`, and `person`
* is the curated allow-list `PersonChip::FIELDS` describes.
*
* ONE BULK PASS for the whole page: `forMany()` inside `rows()` reads
* the alias catalogue and the school year once for the collection, and a
* chip built per row would repeat that for every participant, every
* message author and the assignee on a fifty-reply thread.
*
* `PersonChip::columns()` is the select list because a chip line may
* name ANY user column, and a constrained select hands the helper a
* model whose attribute is simply absent — which it cannot tell from a
* person who has no value, so the line goes blank for everybody with
* nothing failing.
*/
$users = collect(PersonChip::rows(
User::whereIn('id', $userIds)->get(PersonChip::columns())
))->keyBy('id');
$visibleMessages->each(function ($msg) use ($users) { $visibleMessages->each(function ($msg) use ($users) {
$msg->author = $msg->user_id ? ($users[$msg->user_id] ?? null) : null; $msg->author = $msg->user_id ? ($users[$msg->user_id] ?? null) : null;
@@ -462,6 +535,21 @@ class TicketController extends Controller
'agents' => $agents, 'agents' => $agents,
'priorities' => $priorities, 'priorities' => $priorities,
'ticketStatuses' => TicketStatus::orderBy('sort_order')->get(), 'ticketStatuses' => TicketStatus::orderBy('sort_order')->get(),
/*
* WHAT DELETING THIS WOULD TAKE WITH IT — #1567.
*
* The delete confirm was the generic "This cannot be undone.", which
* told an agent tidying up the surviving ticket of a merge nothing
* about the tickets folded into it. `destroy()` now un-merges them
* rather than stranding them, and this is how the confirm can say so
* before the click. Numbers only, and only for the manager who is
* offered Delete at all.
*/
'mergedSources' => $isAgent && $this->isManager($ticket->group_id)
? Ticket::where('merged_into_id', $ticket->id)
->where('status', Ticket::STATUS_MERGED)
->orderBy('id')->pluck('number')->all()
: [],
]); ]);
} }
@@ -630,7 +718,7 @@ class TicketController extends Controller
{ {
$validated = $request->validate([ $validated = $request->validate([
'view_mode' => 'sometimes|in:list,kanban', 'view_mode' => 'sometimes|in:list,kanban',
'filter' => 'sometimes|in:all,mine,unassigned,pending,resolved,merged', 'filter' => 'sometimes|in:'.implode(',', self::VIEW_FILTERS),
]); ]);
if (empty($validated)) { if (empty($validated)) {
@@ -644,14 +732,110 @@ class TicketController extends Controller
return response()->json(['ok' => true]); return response()->json(['ok' => true]);
} }
/**
* DELETE, WITHOUT STRANDING WHAT WAS MERGED IN — [central-ticketing] #1567.
*
* `merged_into_id` is `nullOnDelete()`, so this used to be a one-liner that
* quietly broke every ticket folded into the row it deleted: pointer blanked,
* `status = 'merged'` left behind, permanently read-only, missing from the
* Merged view. {@see StrandedMerge::handleTargetDeletion()} is the whole fix,
* and it runs INSIDE the transaction and BEFORE the delete — it needs the
* doomed row's number for the system notes it writes, and its own
* `merged_into_id` to re-point the sources up the chain.
*
* The flash names what happened, because the agent who deleted this ticket
* was not looking at those tickets and has no other way to find out.
*/
public function destroy(Ticket $ticket) public function destroy(Ticket $ticket)
{ {
if (!$this->isManager($ticket->group_id)) { if (!$this->isManager($ticket->group_id)) {
abort(403); abort(403);
} }
$ticket->delete(); $number = $ticket->number;
return redirect()->route('ticketing.index');
$handled = DB::transaction(function () use ($ticket) {
$handled = StrandedMerge::handleTargetDeletion($ticket, 'user '.Auth::id());
$ticket->delete();
return $handled;
});
return redirect()->route('ticketing.index')
->with('success', $this->deletionFlash($number, $handled));
}
/**
* One sentence per thing that happened to somebody else's ticket. #1567.
*
* @param array{repointed: list<string>, unmerged: list<string>, cleared: list<string>} $handled
*/
private function deletionFlash(string $number, array $handled): string
{
$parts = ["Ticket {$number} deleted."];
if ($handled['unmerged'] !== []) {
$parts[] = sprintf(
'%s %s merged into it and %s been un-merged (status %s) so %s stay usable: %s.',
count($handled['unmerged']),
count($handled['unmerged']) === 1 ? 'ticket was' : 'tickets were',
count($handled['unmerged']) === 1 ? 'has' : 'have',
Ticket::STATUS_UNMERGED,
count($handled['unmerged']) === 1 ? 'it' : 'they',
implode(', ', $handled['unmerged']),
);
}
if ($handled['repointed'] !== []) {
$parts[] = sprintf(
'%s %s merged into it and %s now recorded as merged into its own merge target: %s.',
count($handled['repointed']),
count($handled['repointed']) === 1 ? 'ticket was' : 'tickets were',
count($handled['repointed']) === 1 ? 'is' : 'are',
implode(', ', $handled['repointed']),
);
}
return implode(' ', $parts);
}
/**
* UN-MERGE A STRANDED TICKET — [central-ticketing] #1567.
*
* The recovery for the rows minted before `destroy()` learned to clean up
* after itself: `status = 'merged'` with no `merged_into_id`, read-only on the
* server (#920 reads the status) and pointing at nothing, so there was no
* sequence of clicks that could free one. This is that sequence.
*
* Scoped to {@see Ticket::isStrandedMerge()} and nothing else, so it cannot be
* used to un-merge a LIVE merge — a ticket whose target still exists is
* correctly read-only and stays that way.
*/
public function unmerge(Ticket $ticket)
{
if (! $this->isAgent($ticket->group_id)) {
abort(403);
}
if (! $ticket->isStrandedMerge()) {
// Not an error: the button only renders on a stranded row, so getting
// here means a colleague already dealt with it, or the ticket is
// merged into something that still exists.
return redirect()->route('ticketing.show', $ticket)
->with('success', $ticket->isMerged()
? 'That ticket is merged into a ticket that still exists — nothing to un-merge.'
: 'That ticket is not merged — nothing to un-merge.');
}
StrandedMerge::release(
$ticket,
'The ticket this one had been merged into no longer exists, so this ticket was '
.'un-merged and is editable again.',
'user '.Auth::id(),
);
return redirect()->route('ticketing.show', $ticket)
->with('success', "Ticket {$ticket->number} is un-merged and is no longer read-only.");
} }
/** /**
@@ -740,8 +924,14 @@ class TicketController extends Controller
// Deliberately not an error: the button is only rendered on a row in // Deliberately not an error: the button is only rendered on a row in
// the broken shape, so arriving here means somebody else has already // the broken shape, so arriving here means somebody else has already
// fixed it, and being told so is the right answer. // fixed it, and being told so is the right answer.
//
// #1567 gave `merged_inconsistent` a second shape, and "already
// consistent" would be a lie on one of them: a stranded row is still
// flagged, and what it needs is `unmerge()`, not this.
return redirect()->route('ticketing.show', $ticket) return redirect()->route('ticketing.show', $ticket)
->with('success', 'That ticket is already consistent — nothing to fix.'); ->with('success', $ticket->isStrandedMerge()
? 'That ticket is merged into a ticket that no longer exists — un-merge it instead.'
: 'That ticket is already consistent — nothing to fix.');
} }
MergedTicketRepair::repair($ticket, 'user '.Auth::id()); MergedTicketRepair::repair($ticket, 'user '.Auth::id());
@@ -901,6 +1091,66 @@ class TicketController extends Controller
* Search users by name/email — for the participant picker. * Search users by name/email — for the participant picker.
* Returns up to 10 matches, excluding existing participants and the submitter. * Returns up to 10 matches, excluding existing participants and the submitter.
*/ */
/**
* WHO TO ADD AS A PARTICIPANT — and it answers in CHIPS (#1598).
*
* The operator, 11:46 PDT 2026-09-10, having just had the device picker
* converted: *"are there other places we can search users where we're not
* using the chips? please go through and check."* This endpoint was one of
* the six the lead's audit found that were not, and it is central-ticketing's.
*
* It returned `DB::table('users')->get(['id', 'name', 'email'])`, so the
* picker drew a name and an address per row and nothing else: no role dot to
* tell an agent that "D. Ellis" is the child rather than the parent of the
* same surname, and — because those two fields were once the WHOLE of a chip
* — a school that configures the student chip to grade + homeroom would have
* been left with this one picker still showing an address.
*
* `PersonChip::rows()` is the shared serializer and this is now the same
* answer, key for key, as `admin.settings.users.search` — which is the point
* rather than a coincidence: `TicketParticipantsAreChipsTest` compares the
* two payloads against each other instead of against a literal list, so a
* key added to the platform's row cannot skip this surface.
*
* WHO IS SEARCHABLE DOES NOT CHANGE. Same `like` on name-or-email, same
* two-character floor, same limit of 10, same exclusion of the people
* already on the ticket, and `User` carries no global scope or soft delete
* that `DB::table('users')` did not — measured against the model on
* 2026-09-10. The card was explicit that this one is about the DRAWING.
*
* Two things about the query are not cosmetic:
*
* - `PersonChip::columns()` and not `['id', 'name', 'email']`. A chip line
* may name any user column, and a constrained select hands the helper a
* model whose attribute is simply ABSENT — indistinguishable from a
* person who has no value, so the line is blank for everybody with
* nothing failing. `PersonChip::columns()`' own docblock has the trap;
* `PersonChipSurfacesTest::test_a_chip_is_never_built_from_a_hand_written_select`
* is the shell's guard against it.
* - The name-or-email `like` stays inside its own closure. Flattened beside
* the exclusion it would be an `OR` at the top level and an address match
* would smuggle a person already on the ticket back into the list — the
* operator-precedence hole the same shape opened on [central-inventory]
* #1594.
*
* AN ORDER AT ALL is new, and it is `PersonNames::orderUsers()` rather than
* `orderBy('name')`. The old query had no order, so ten rows arrived in
* whatever sequence the storage engine happened to return them and the same
* two letters could list the same people differently twice running. But the
* column that makes an order CONSISTENT is not automatically the one that
* makes it READABLE: `users.name` is the cached "First Last" ("Andrew Fast")
* and these rows are chips, which read "Last, First" ("Fast, Andrew"). A
* list labelled one way and collated the other is what an operator calls
* unsorted — "Toews, Fast, Ivanov, Mwangi, Bergman" is perfectly ordered by
* a string the row no longer shows. `PersonNames::orderUsers()` is the
* platform's one answer to that (#524), it is what the reference search
* (`admin.settings.users.search`) and the sibling conversions use, and it
* honours the operator's `name_format` rather than assuming surname-first.
*
* It also decides WHICH TEN come back, not merely their sequence, so this is
* not cosmetic: on a common surname the limit falls on a different set of
* people under the two collations.
*/
public function searchUsers(Request $request, Ticket $ticket) public function searchUsers(Request $request, Ticket $ticket)
{ {
if (! $this->isAgent($ticket->group_id)) { if (! $this->isAgent($ticket->group_id)) {
@@ -918,16 +1168,16 @@ class TicketController extends Controller
->unique() ->unique()
->values(); ->values();
$users = DB::table('users') return response()->json(PersonChip::rows(
->where(function ($query) use ($q) { User::where(function ($query) use ($q) {
$query->where('name', 'like', "%{$q}%") $query->where('name', 'like', "%{$q}%")
->orWhere('email', 'like', "%{$q}%"); ->orWhere('email', 'like', "%{$q}%");
}) })
->whereNotIn('id', $excludeIds) ->whereNotIn('id', $excludeIds)
->limit(10) ->tap(fn ($query) => PersonNames::orderUsers($query))
->get(['id', 'name', 'email']); ->limit(10)
->get(PersonChip::columns())
return response()->json($users); ));
} }
public function myTickets(): Response public function myTickets(): Response

View File

@@ -12,6 +12,22 @@ class Ticket extends Model
/** Set only by TicketController::merge(); never offered by any form. */ /** Set only by TicketController::merge(); never offered by any form. */
public const STATUS_MERGED = 'merged'; public const STATUS_MERGED = 'merged';
/**
* WHERE AN UN-MERGED TICKET LANDS — [central-ticketing] #1567.
*
* A merge is a way of closing a ticket, so a ticket that is un-merged because
* its target was deleted goes to `closed` and not to `open`: it stays out of
* the All Open / Mine / Unassigned work queues, exactly as it was before, and
* the only thing that changes is that it is no longer read-only, so an agent
* can reopen it, reply to it or reassign it. Un-merging to `open` would push
* somebody's tidied-away ticket back into a live queue without being asked.
*
* It is one of the six values the `tickets.status` ENUM allows and it is
* `is_closed` in `ticketing_statuses`, so both the column and every count
* that reads `$closedSlugs` already understand it.
*/
public const STATUS_UNMERGED = 'closed';
/** /**
* What every surface says when a write to a merged ticket is refused. The Show * What every surface says when a write to a merged ticket is refused. The Show
* page has displayed this sentence since merge shipped; #920 was that it was * page has displayed this sentence since merge shipped; #920 was that it was
@@ -48,8 +64,12 @@ class Ticket extends Model
* `t.merged_into_id && t.status !== 'merged'` is what keeps the client's idea * `t.merged_into_id && t.status !== 'merged'` is what keeps the client's idea
* of "inconsistent" from drifting away from the scope the repair uses. * of "inconsistent" from drifting away from the scope the repair uses.
* It costs no query — both columns are already loaded. * It costs no query — both columns are already loaded.
*
* #1567 added `merged_stranded` beside it, for the same reason: there are now
* TWO ways a merge can fail to add up and they need different offers, so the
* page is handed which one it is rather than working it out from the columns.
*/ */
protected $appends = ['merged_inconsistent']; protected $appends = ['merged_inconsistent', 'merged_stranded'];
protected $casts = [ protected $casts = [
'due_date' => 'date:Y-m-d', 'due_date' => 'date:Y-m-d',
@@ -139,9 +159,93 @@ class Ticket extends Model
return $this->merged_into_id !== null && ! $this->isMerged(); return $this->merged_into_id !== null && ! $this->isMerged();
} }
/** @see $appends — the same answer, for the page. */ /**
* THE OTHER DIRECTION — [central-ticketing] #1567.
*
* `status = 'merged'` with NOTHING to point at. `merged_into_id` carries
* `nullOnDelete()`, so deleting the ticket that others had been merged INTO
* used to blank their pointer and leave the status behind: a row that
* {@see isMerged()} still calls read-only, whose banner names a ticket that
* no longer exists, and which the Merged view — scoped by the pointer — could
* not list. Nothing in the product could act on it.
*
* `destroy()` no longer mints these ({@see \Dashboard\Ticketing\Support\StrandedMerge}),
* but the rows already made are still out there, so the shape needs a name:
* this is what the badge offers to un-merge and what the Merged view now
* includes.
*
* Deliberately NOT folded into {@see scopeInconsistentlyMerged()}: that scope
* is what #938's repair writes `status = 'merged'` over, and a stranded row
* already HAS that status — repairing it would match forever and write
* nothing, which is exactly the idempotency the repair guarantees.
*/
public function scopeStrandedMerge(Builder $query): Builder
{
return $query->where('status', self::STATUS_MERGED)
->whereNull('merged_into_id');
}
/** The row-level twin of {@see scopeStrandedMerge()}. */
public function isStrandedMerge(): bool
{
return $this->isMerged() && $this->merged_into_id === null;
}
/**
* EITHER shape of a merge that does not add up — #938's and #1567's.
*
* The two are mutually exclusive by construction (one has a pointer and the
* wrong status, the other has the right status and no pointer), and the
* badge, the sidebar's warning count and `merged_inconsistent` all want the
* union: "this row's status and its pointer disagree, whichever way round".
* The repair scopes stay separate because the fixes differ.
*/
public function scopeMergeInconsistent(Builder $query): Builder
{
return $query->where(function (Builder $q) {
$q->where(fn (Builder $i) => $i->inconsistentlyMerged())
->orWhere(fn (Builder $s) => $s->strandedMerge());
});
}
/**
* Every row that carries the merge shape AT ALL — what the Merged view lists.
*
* Pointer set (whatever the status: #938's rows included) or status `merged`
* (whether or not the pointer survived: #1567's stranded rows included).
* Scoping the view by the pointer alone dropped a stranded row out of the one
* view whose whole job is showing merges, leaving it visible only under
* Resolved — so a reader looking for merged tickets never found it.
*/
public function scopeEverMerged(Builder $query): Builder
{
return $query->where(function (Builder $q) {
$q->whereNotNull('merged_into_id')
->orWhere('status', self::STATUS_MERGED);
});
}
/**
* @see $appends — the same answer, for the page.
*
* #1567 widened this to the union: a stranded row is inconsistent in the
* plainest sense (it says it is merged into nothing), and the flag existing
* while reading `false` on exactly that row was half of what the card
* reported.
*/
public function getMergedInconsistentAttribute(): bool public function getMergedInconsistentAttribute(): bool
{ {
return $this->isInconsistentlyMerged(); return $this->isInconsistentlyMerged() || $this->isStrandedMerge();
}
/**
* @see $appends — WHICH of the two shapes, for a page that must offer
* different fixes. `merged_inconsistent` says something is wrong;
* `merged_stranded` says the target is gone, so the offer is "un-merge"
* rather than #938's "mark merged".
*/
public function getMergedStrandedAttribute(): bool
{
return $this->isStrandedMerge();
} }
} }

View File

@@ -0,0 +1,202 @@
<?php
namespace Dashboard\Ticketing\Support;
use Dashboard\Ticketing\Models\Ticket;
use Dashboard\Ticketing\Models\TicketMessage;
use Illuminate\Support\Facades\Log;
/**
* DELETING A MERGE TARGET MUST NOT STRAND WHAT WAS MERGED INTO IT — #1567.
*
* `tickets.merged_into_id` is declared `nullOnDelete()`, so deleting a ticket
* that other tickets had been merged INTO used to blank their pointer and walk
* away, leaving `status = 'merged'` behind with nothing on the other end:
*
* - {@see Ticket::isMerged()} still calls the row read-only, so the page drops
* the status / priority / assignee selects and the reply composer, and the
* only control left on it is Delete. Nothing can reopen it, reassign it or
* reply to it — ever.
* - the banner "This ticket has been merged and is read-only." names a merge
* target that no longer exists.
* - the Merged view was scoped by the pointer, so the row vanished from the one
* view whose job is showing merges and turned up only under Resolved.
*
* And `destroy()` gave no hint any of this was about to happen: the confirm was
* the generic "This cannot be undone."
*
* ── WHAT THIS DOES INSTEAD ──────────────────────────────────────────────────
*
* {@see handleTargetDeletion()} runs inside `destroy()`'s transaction, BEFORE the
* row goes, and gives every ticket pointing at it somewhere real to be:
*
* RE-POINT, when the doomed ticket was itself merged into a third ticket. The
* messages genuinely did travel that far — merge moves them to the target, so
* merging the target onward moved them again — and the surviving ticket at the
* end of the chain really is where this ticket's content lives. This is the
* answer that keeps the merge true.
*
* UN-MERGE, otherwise. There is nowhere left to point, so the row stops
* claiming to be merged: {@see Ticket::STATUS_UNMERGED} (`closed`) and a NULL
* pointer, which is an ordinary closed ticket — out of the work queues, but
* editable, reopenable and answerable again.
*
* Either way the source gets a system note saying which ticket was deleted and
* what happened to it, because the row is being changed by somebody who was
* looking at a different ticket entirely and its own history is the only place
* that will ever explain it.
*
* ── THE ROWS ALREADY OUT THERE ──────────────────────────────────────────────
*
* This stops new ones. The stranded rows prod already holds are found by
* {@see Ticket::scopeStrandedMerge()}, now report `merged_inconsistent`, are
* listed by the Merged view, and are released one at a time by
* {@see \Dashboard\Ticketing\Http\Controllers\TicketController::unmerge()} —
* which calls {@see release()} here, so "un-merged" means one thing whichever
* door it came through.
*
* Deliberately NOT part of {@see MergedTicketRepair}: that class repairs #938's
* shape by writing `status = 'merged'` onto a row that has a target. This is the
* opposite operation on the opposite shape, and the two must not share a scope.
*/
class StrandedMerge
{
/** How many rows are stranded right now — status `merged`, pointer NULL. */
public static function count(): int
{
return Ticket::query()->strandedMerge()->count();
}
/**
* The stranded rows themselves.
*
* @return \Illuminate\Database\Eloquent\Collection<int,Ticket>
*/
public static function rows()
{
return Ticket::query()->strandedMerge()->orderBy('id')->get();
}
/**
* Give every ticket merged into `$target` somewhere real to be, before
* `$target` is deleted. Call inside the deleting transaction.
*
* Group membership is NOT re-checked per source. A source can live in another
* group, and the alternative to touching it is leaving it permanently frozen
* — this is the delete's own clean-up, not a write the operator chose to make
* on that ticket.
*
* @return array{repointed: list<string>, unmerged: list<string>, cleared: list<string>}
* ticket numbers, by what happened to them
*/
public static function handleTargetDeletion(Ticket $target, string $by): array
{
$sources = Ticket::where('merged_into_id', $target->id)->get();
$result = ['repointed' => [], 'unmerged' => [], 'cleared' => []];
if ($sources->isEmpty()) {
return $result;
}
// Where the content actually went. `merged_into_id` is nulled when ITS
// target is deleted, so this is either a live ticket or nothing.
$chain = $target->merged_into_id;
foreach ($sources as $source) {
// #938's shape: the pointer is stale but the status is live, so the
// row is an ordinary working ticket that happens to carry a dangling
// id. Dropping the id is the whole fix — and it is what the FK was
// about to do anyway; doing it here means the row is consistent
// inside this transaction rather than as a side effect afterwards.
if (! $source->isMerged()) {
$source->forceFill(['merged_into_id' => null])->save();
$result['cleared'][] = $source->number;
continue;
}
// `$chain === $source->id` cannot be produced by `merge()` (it
// refuses a merged source and a self-merge), but a cycle would make
// the row point at itself, which is worse than un-merging it.
if ($chain !== null && $chain !== $source->id) {
$chainTicket = Ticket::find($chain);
if ($chainTicket) {
$source->forceFill(['merged_into_id' => $chainTicket->id])->save();
TicketMessage::system($source, sprintf(
'Ticket %s was deleted. This ticket had been merged into it, and %s '
.'had itself been merged into %s — where its messages now live — so it '
.'is recorded as merged into %s.',
$target->number,
$target->number,
$chainTicket->number,
$chainTicket->number,
));
$result['repointed'][] = $source->number;
continue;
}
}
self::release(
$source,
sprintf(
'Ticket %s, which this ticket had been merged into, was deleted. This '
.'ticket has been un-merged so that it is no longer read-only; its status '
.'is now %s.',
$target->number,
Ticket::STATUS_UNMERGED,
),
$by,
);
$result['unmerged'][] = $source->number;
}
Log::info(sprintf(
'[ticketing] #1567 deleting %s: re-pointed %d, un-merged %d, cleared %d dangling pointer(s) (%s).',
$target->number,
count($result['repointed']),
count($result['unmerged']),
count($result['cleared']),
$by,
));
return $result;
}
/**
* Un-merge ONE ticket: status to {@see Ticket::STATUS_UNMERGED}, pointer to
* NULL, and a system note saying why.
*
* `forceFill`, not `update([...])`, for the same reason the rest of the merge
* code uses it: this is the machinery correcting its own state, and it must
* not be routed through anything that treats `merged` as read-only.
*
* Returns false when the row was not merged at all, so a double-clicked
* button and a stale page are no-ops rather than a second write.
*/
public static function release(Ticket $ticket, string $reason, string $by): bool
{
if (! $ticket->isMerged()) {
return false;
}
$ticket->forceFill([
'status' => Ticket::STATUS_UNMERGED,
'merged_into_id' => null,
])->save();
TicketMessage::system($ticket, $reason);
Log::info(sprintf(
'[ticketing] #1567 un-merged %s to %s (%s).',
$ticket->number,
Ticket::STATUS_UNMERGED,
$by,
));
return true;
}
}

View File

@@ -78,6 +78,8 @@ Route::middleware(['web', 'auth', 'app.access:ticketing'])
Route::post('/{ticket}/split', [TicketController::class, 'split']) ->name('split'); Route::post('/{ticket}/split', [TicketController::class, 'split']) ->name('split');
// #938 — the one-click fix for a row the merge bug left inconsistent. // #938 — the one-click fix for a row the merge bug left inconsistent.
Route::post('/{ticket}/mark-merged', [TicketController::class, 'markMerged']) ->name('mark-merged'); Route::post('/{ticket}/mark-merged', [TicketController::class, 'markMerged']) ->name('mark-merged');
// #1567 — the one-click release for a row whose merge target was deleted.
Route::post('/{ticket}/unmerge', [TicketController::class, 'unmerge']) ->name('unmerge');
Route::post('/{ticket}/participants', [TicketController::class, 'addParticipant']) ->name('participants.store'); Route::post('/{ticket}/participants', [TicketController::class, 'addParticipant']) ->name('participants.store');
Route::delete('/{ticket}/participants/{userId}', [TicketController::class, 'removeParticipant'])->name('participants.destroy'); Route::delete('/{ticket}/participants/{userId}', [TicketController::class, 'removeParticipant'])->name('participants.destroy');
Route::get('/{ticket}/users/search', [TicketController::class, 'searchUsers']) ->name('users.search'); Route::get('/{ticket}/users/search', [TicketController::class, 'searchUsers']) ->name('users.search');