Compare commits
12
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4aa83ffe58 | ||
|
|
844677bbce | ||
|
|
3fcd1cbf0e | ||
|
|
3ab33d8df2 | ||
|
|
3778a599c3 | ||
|
|
310dcd0840 | ||
|
|
d205a9577a | ||
|
|
5572f0be45 | ||
|
|
1600412a6d | ||
|
|
803c65616b | ||
|
|
0e163f6607 | ||
|
|
e1448d8ea2 |
+1
-1
@@ -20,6 +20,6 @@
|
||||
"no-useless-escape": "warn",
|
||||
"no-regex-spaces": "warn",
|
||||
"semi": ["error", "always"],
|
||||
"eqeqeq": "warn"
|
||||
"eqeqeq": ["warn", "smart"]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -255,6 +255,7 @@ Content-Type: application/json
|
||||
|
||||
- `migrations/000_baseline.sql` is the full schema baseline for the whole database. It is written to be safe to re-run (idempotent) and is the source of truth for a fresh install.
|
||||
- `php migrations/migrate.php` applies any pending migration files in `migrations/` in order, tracking applied files in the `migrations` table. Use `--status` to list state and `--dry-run` to preview without executing.
|
||||
- Numbered migrations on top of the baseline (all idempotent, safe to re-run): `001_widen_bulk_operations_status.sql`, `002_fix_collation_consistency.sql`, `003_fk_on_delete_set_null.sql`, `004_fix_ticket_watchers_type.sql`. A fresh install via `000_baseline.sql` already includes all of these; they only matter for upgrading an existing database.
|
||||
|
||||
### API Endpoints
|
||||
|
||||
@@ -348,7 +349,9 @@ tinker_tickets/
|
||||
│ └── images/
|
||||
│ └── favicon.png
|
||||
├── config/
|
||||
│ └── config.php # Config + .env loading
|
||||
│ ├── config.php # Config + .env loading
|
||||
│ └── requirements.php # PHP version/extension requirements (single source of
|
||||
│ # truth for scripts/check_requirements.php + api/health.php)
|
||||
├── controllers/
|
||||
│ ├── CommentController.php # Comment create/edit/delete + notifications
|
||||
│ ├── DashboardController.php # Dashboard with stats + filters
|
||||
@@ -389,6 +392,10 @@ tinker_tickets/
|
||||
│ └── WorkflowModel.php # Status transition workflows
|
||||
├── migrations/
|
||||
│ ├── 000_baseline.sql # Full schema baseline (safe to re-run)
|
||||
│ ├── 001_widen_bulk_operations_status.sql # Upgrade-only (already in baseline for fresh installs)
|
||||
│ ├── 002_fix_collation_consistency.sql # Upgrade-only (already in baseline for fresh installs)
|
||||
│ ├── 003_fk_on_delete_set_null.sql # Upgrade-only (already in baseline for fresh installs)
|
||||
│ ├── 004_fix_ticket_watchers_type.sql # Upgrade-only (already in baseline for fresh installs)
|
||||
│ └── migrate.php # CLI migration runner (tracks applied migrations)
|
||||
├── scripts/
|
||||
│ ├── check_requirements.php # Verify PHP extensions/config prerequisites
|
||||
@@ -406,6 +413,9 @@ tinker_tickets/
|
||||
│ │ └── WorkflowDesignerView.php # Workflow transition designer
|
||||
│ ├── CreateTicketView.php # Ticket creation with visibility
|
||||
│ ├── DashboardView.php # Dashboard with kanban + sidebar + charts
|
||||
│ ├── error_403.php # Access-denied error page
|
||||
│ ├── error_404.php # Not-found error page
|
||||
│ ├── error_500.php # Fatal-error page (self-contained, no app-state deps)
|
||||
│ ├── layout_footer.php # Shared footer (notification polling, boot sequence)
|
||||
│ ├── layout_header.php # Shared header (nav, command palette, theme toggle)
|
||||
│ └── TicketView.php # Ticket view with timeline, SLA, watcher avatars
|
||||
|
||||
@@ -131,12 +131,19 @@ if (isset($result['error'])) {
|
||||
if ($inaccessibleCount > 0) {
|
||||
$message .= " ($inaccessibleCount skipped - no access)";
|
||||
}
|
||||
echo json_encode([
|
||||
$response = [
|
||||
'success' => true,
|
||||
'operation_id' => $operationId,
|
||||
'processed' => $result['processed'],
|
||||
'failed' => $result['failed'],
|
||||
'skipped' => $inaccessibleCount,
|
||||
'message' => $message
|
||||
]);
|
||||
];
|
||||
// Best-effort batches (the default; see processBulkOperation()'s docblock)
|
||||
// can partially fail — surface the per-ticket reasons so the admin isn't
|
||||
// just told a count. The dashboard's bulkResultMessage() already expects this.
|
||||
if (!empty($result['errors'])) {
|
||||
$response['errors'] = $result['errors'];
|
||||
}
|
||||
echo json_encode($response);
|
||||
}
|
||||
|
||||
+27
-21
@@ -126,23 +126,6 @@ if ($workflowModel->transitionRequiresComment($currentStatus, $newStatus) && $co
|
||||
exit;
|
||||
}
|
||||
|
||||
// Post the comment first (per-key label) so a close-with-reason is one call.
|
||||
if ($comment !== '') {
|
||||
$commentModel = new CommentModel($conn);
|
||||
$commentResult = $commentModel->addComment($ticketId, [
|
||||
'user_name' => $keyName,
|
||||
'comment_text' => $comment,
|
||||
'markdown_enabled' => !empty($data['markdown_enabled']),
|
||||
], $createdBy);
|
||||
if (empty($commentResult['success'])) {
|
||||
error_log('ticket_status_api: addComment failed for ticket ' . $ticketId
|
||||
. ': ' . ($commentResult['error'] ?? 'unknown'));
|
||||
http_response_code(500);
|
||||
echo json_encode(['success' => false, 'error' => 'Failed to add comment']);
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
// Apply the status change. updateTicket sets updated_by/updated_at and handles
|
||||
// closed_at (set on close, cleared on reopen) via its own SQL.
|
||||
$updateData = [
|
||||
@@ -155,10 +138,33 @@ $updateData = [
|
||||
'priority' => (int)$ticket['priority'],
|
||||
];
|
||||
|
||||
$updateResult = $ticketModel->updateTicket($updateData, $createdBy);
|
||||
if (empty($updateResult['success'])) {
|
||||
error_log('ticket_status_api: updateTicket failed for ticket ' . $ticketId
|
||||
. ': ' . ($updateResult['error'] ?? 'unknown'));
|
||||
// Post the comment and apply the status change in one transaction, so a
|
||||
// failure partway through can't leave a "reason" comment persisted with no
|
||||
// matching status change (previously these were two independent writes with
|
||||
// no shared rollback).
|
||||
$conn->begin_transaction();
|
||||
try {
|
||||
if ($comment !== '') {
|
||||
$commentModel = new CommentModel($conn);
|
||||
$commentResult = $commentModel->addComment($ticketId, [
|
||||
'user_name' => $keyName,
|
||||
'comment_text' => $comment,
|
||||
'markdown_enabled' => !empty($data['markdown_enabled']),
|
||||
], $createdBy);
|
||||
if (empty($commentResult['success'])) {
|
||||
throw new Exception($commentResult['error'] ?? 'Failed to add comment');
|
||||
}
|
||||
}
|
||||
|
||||
$updateResult = $ticketModel->updateTicket($updateData, $createdBy);
|
||||
if (empty($updateResult['success'])) {
|
||||
throw new Exception($updateResult['error'] ?? 'Failed to update ticket status');
|
||||
}
|
||||
|
||||
$conn->commit();
|
||||
} catch (Exception $e) {
|
||||
$conn->rollback();
|
||||
error_log('ticket_status_api: transaction failed for ticket ' . $ticketId . ': ' . $e->getMessage());
|
||||
http_response_code(500);
|
||||
echo json_encode(['success' => false, 'error' => 'Failed to update ticket status']);
|
||||
exit;
|
||||
|
||||
+56
-29
@@ -195,8 +195,8 @@ try {
|
||||
|
||||
// Enforce requires_comment transitions server-side.
|
||||
if ($this->workflowModel->transitionRequiresComment($currentTicket['status'], $updateData['status'])) {
|
||||
$comment = trim((string)($data['comment'] ?? $data['comment_text'] ?? ''));
|
||||
if ($comment === '') {
|
||||
$statusChangeComment = trim((string)($data['comment'] ?? $data['comment_text'] ?? ''));
|
||||
if ($statusChangeComment === '') {
|
||||
return [
|
||||
'success' => false,
|
||||
'error' => 'A comment is required for this status change',
|
||||
@@ -207,40 +207,67 @@ try {
|
||||
}
|
||||
}
|
||||
|
||||
// Update ticket with user tracking and optional optimistic locking
|
||||
$expectedUpdatedAt = $data['expected_updated_at'] ?? null;
|
||||
$result = $this->ticketModel->updateTicket($updateData, $this->userId, $expectedUpdatedAt);
|
||||
// A comment accompanying a status change (required or optional) is
|
||||
// persisted in the SAME transaction as the status update below, so
|
||||
// a failure partway through can't leave an orphaned "reason"
|
||||
// comment attached with no matching status change — the two
|
||||
// previously ran as separate, non-transactional HTTP calls from
|
||||
// the client (add_comment.php then update_ticket.php).
|
||||
$statusChangeComment = $statusChangeComment ?? trim((string)($data['comment'] ?? $data['comment_text'] ?? ''));
|
||||
|
||||
// Handle conflict case
|
||||
if (!$result['success']) {
|
||||
$response = [
|
||||
'success' => false,
|
||||
'error' => $result['error'] ?? 'Failed to update ticket in database'
|
||||
];
|
||||
if (!empty($result['conflict'])) {
|
||||
$result = null;
|
||||
$this->conn->begin_transaction();
|
||||
try {
|
||||
if ($statusChangeComment !== '' && $currentTicket['status'] !== $updateData['status']) {
|
||||
$commentResult = $this->commentModel->addComment($id, [
|
||||
'user_name' => $this->currentUser['display_name'] ?? $this->currentUser['username'] ?? 'User',
|
||||
'comment_text' => $statusChangeComment,
|
||||
'markdown_enabled' => !empty($data['markdown_enabled']),
|
||||
], $this->userId);
|
||||
if (empty($commentResult['success'])) {
|
||||
throw new Exception($commentResult['error'] ?? 'Failed to add comment');
|
||||
}
|
||||
}
|
||||
|
||||
// Update ticket with user tracking and optional optimistic locking
|
||||
$expectedUpdatedAt = $data['expected_updated_at'] ?? null;
|
||||
$result = $this->ticketModel->updateTicket($updateData, $this->userId, $expectedUpdatedAt);
|
||||
if (!$result['success']) {
|
||||
throw new Exception($result['error'] ?? 'Failed to update ticket in database');
|
||||
}
|
||||
|
||||
// Handle visibility update if provided (already validated above)
|
||||
if (isset($data['visibility'])) {
|
||||
$visResult = $this->ticketModel->updateVisibility($id, $data['visibility'], $visibilityGroups, $this->userId);
|
||||
if (!$visResult) {
|
||||
throw new Exception('Failed to update ticket visibility');
|
||||
}
|
||||
}
|
||||
|
||||
$this->conn->commit();
|
||||
} catch (Exception $e) {
|
||||
$this->conn->rollback();
|
||||
$response = ['success' => false, 'error' => $e->getMessage()];
|
||||
if (is_array($result) && !empty($result['conflict'])) {
|
||||
$response['conflict'] = true;
|
||||
$response['current_updated_at'] = $result['current_updated_at'] ?? null;
|
||||
}
|
||||
return $response;
|
||||
}
|
||||
|
||||
// Handle visibility update if provided (already validated above)
|
||||
if (isset($data['visibility'])) {
|
||||
$visResult = $this->ticketModel->updateVisibility($id, $data['visibility'], $visibilityGroups, $this->userId);
|
||||
if ($visResult && $this->userId) {
|
||||
$this->auditLog->log(
|
||||
$this->userId,
|
||||
'update',
|
||||
'ticket',
|
||||
(string)$id,
|
||||
[
|
||||
'field' => 'visibility',
|
||||
'from' => $currentTicket['visibility'] ?? 'public',
|
||||
'to' => $data['visibility'],
|
||||
'groups' => $visibilityGroups
|
||||
]
|
||||
);
|
||||
}
|
||||
if (isset($data['visibility']) && $this->userId) {
|
||||
$this->auditLog->log(
|
||||
$this->userId,
|
||||
'update',
|
||||
'ticket',
|
||||
(string)$id,
|
||||
[
|
||||
'field' => 'visibility',
|
||||
'from' => $currentTicket['visibility'] ?? 'public',
|
||||
'to' => $data['visibility'],
|
||||
'groups' => $visibilityGroups
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
// Log ticket update to audit log — only the changed fields (delta)
|
||||
|
||||
+19
-74
@@ -41,6 +41,16 @@
|
||||
* 32. Drag & Drop Upload
|
||||
* 33. Intersection Observer
|
||||
* 34. Full Initialisation
|
||||
*
|
||||
* NOTE ON EMPTY CATCH BLOCKS: throughout this file, `try { ... } catch (_) {}`
|
||||
* around localStorage/sessionStorage access (persisted tab/theme/column-
|
||||
* visibility state, recent command-palette entries, etc.) and the terminal
|
||||
* beep's AudioContext calls is intentional, not an oversight — these are
|
||||
* best-effort UX affordances that must silently no-op rather than break the
|
||||
* surrounding feature if storage is disabled/full (private browsing, quota)
|
||||
* or audio is blocked (autoplay policy). Swallowing errors from arbitrary
|
||||
* caller-supplied callbacks (e.g. viewport-change listeners) is handled
|
||||
* separately with real logging, since those can hide genuine bugs.
|
||||
*/
|
||||
|
||||
(function (global) {
|
||||
@@ -1398,7 +1408,7 @@
|
||||
_vpCurrent = bp;
|
||||
if (bp !== prev) {
|
||||
const evt = { bp, w, h, prev };
|
||||
_vpListeners.forEach(cb => { try { cb(evt); } catch (_) {} });
|
||||
_vpListeners.forEach(cb => { try { cb(evt); } catch (e) { console.error('[lt.viewport] listener threw:', e); } });
|
||||
bus.emit('viewport:change', evt);
|
||||
}
|
||||
}
|
||||
@@ -2848,8 +2858,11 @@
|
||||
TICKET STATUS CHANGE (comment-aware)
|
||||
lt.ticketStatus.submit(ticketId, newStatus, { comment? }) → Promise<data>
|
||||
Posts /api/update_ticket.php. If the server rejects with
|
||||
requires_comment, opens a comment modal, persists the comment via
|
||||
/api/add_comment.php, then retries the update once WITH the comment.
|
||||
requires_comment, opens a comment modal, then retries the update once
|
||||
WITH the comment — update_ticket.php persists it in the same DB
|
||||
transaction as the status change itself, so there's no separate
|
||||
add_comment.php call that could leave an orphaned comment if the
|
||||
status update then failed.
|
||||
Rejects with err.cancelled === true if the user cancels the modal.
|
||||
================================================================ */
|
||||
function _statusCommentModal(newStatus) {
|
||||
@@ -2912,81 +2925,14 @@
|
||||
cancelErr.cancelled = true;
|
||||
throw cancelErr;
|
||||
}
|
||||
// Persist the comment, then retry the status change with it included.
|
||||
return api.post('/api/add_comment.php', { ticket_id: id, comment_text: comment })
|
||||
.then(() => api.post('/api/update_ticket.php', { ticket_id: id, status: newStatus, comment: comment }));
|
||||
// Retry with the comment included — update_ticket.php persists it
|
||||
// transactionally with the status update itself.
|
||||
return api.post('/api/update_ticket.php', { ticket_id: id, status: newStatus, comment: comment });
|
||||
});
|
||||
});
|
||||
},
|
||||
};
|
||||
|
||||
/* ================================================================
|
||||
MODULE 54 — MARKDOWN RENDERER
|
||||
lt.markdown.render(mdString) → HTML string (sanitized)
|
||||
lt.markdown.init(selector) → renders all matching el's .textContent
|
||||
Uses a built-in micro-renderer (no deps) for common syntax.
|
||||
For full GFM, swap in marked.js: window.marked && marked.parse()
|
||||
================================================================ */
|
||||
const markdown = {
|
||||
render(md) {
|
||||
// Always use the built-in XSS-safe micro-renderer. Do NOT delegate to
|
||||
// window.marked / window.markdownit: their raw HTML output is not sanitized
|
||||
// here, so delegating would enable stored XSS if such a lib were ever loaded.
|
||||
// Micro-renderer: covers headings, bold, italic, code, links, lists, blockquote, hr
|
||||
let html = escHtml(md)
|
||||
// Fenced code blocks
|
||||
.replace(/```(\w*)\n([\s\S]*?)```/g, (_, lang, code) => `<pre class="lt-code-block"><code class="lt-tok tok-${lang || 'plain'}">${code.trim()}</code></pre>`)
|
||||
// Inline code
|
||||
.replace(/`([^`]+)`/g, '<code>$1</code>')
|
||||
// Headings
|
||||
.replace(/^######\s(.+)$/gm, '<h6>$1</h6>')
|
||||
.replace(/^#####\s(.+)$/gm, '<h5>$1</h5>')
|
||||
.replace(/^####\s(.+)$/gm, '<h4>$1</h4>')
|
||||
.replace(/^###\s(.+)$/gm, '<h3>$1</h3>')
|
||||
.replace(/^##\s(.+)$/gm, '<h2>$1</h2>')
|
||||
.replace(/^#\s(.+)$/gm, '<h1>$1</h1>')
|
||||
// Bold / italic
|
||||
.replace(/\*\*\*(.+?)\*\*\*/g, '<strong><em>$1</em></strong>')
|
||||
.replace(/\*\*(.+?)\*\*/g, '<strong>$1</strong>')
|
||||
.replace(/\*(.+?)\*/g, '<em>$1</em>')
|
||||
.replace(/__(.+?)__/g, '<strong>$1</strong>')
|
||||
.replace(/_(.+?)_/g, '<em>$1</em>')
|
||||
// Links — block javascript: and data: URIs
|
||||
.replace(/\[([^\]]+)\]\(([^)]+)\)/g, (_, text, url) => {
|
||||
const safeUrl = /^(https?:\/\/|\/|#|\.\.?\/)/i.test(url) ? url : '#';
|
||||
return `<a href="${safeUrl}" target="_blank" rel="noopener noreferrer">${escHtml(text)}</a>`;
|
||||
})
|
||||
// Images — block javascript: and data: URIs
|
||||
.replace(/!\[([^\]]*)\]\(([^)]+)\)/g, (_, alt, src) => {
|
||||
const safeSrc = /^(https?:\/\/|\/|\.\.?\/)/i.test(src) ? src : '';
|
||||
return `<img src="${safeSrc}" alt="${escHtml(alt)}" style="max-width:100%">`;
|
||||
})
|
||||
// Blockquote
|
||||
.replace(/^>\s(.+)$/gm, '<blockquote>$1</blockquote>')
|
||||
// Horizontal rule
|
||||
.replace(/^(-{3,}|\*{3,}|_{3,})$/gm, '<hr>')
|
||||
// Unordered list items
|
||||
.replace(/^[-*+]\s(.+)$/gm, '<li>$1</li>')
|
||||
.replace(/(<li>[\s\S]+?<\/li>\n?)+/g, m => `<ul>${m}</ul>`)
|
||||
// Ordered list items
|
||||
.replace(/^\d+\.\s(.+)$/gm, '<li>$1</li>')
|
||||
// Paragraphs (double newline)
|
||||
.replace(/\n{2,}/g, '</p><p>')
|
||||
.replace(/\n/g, '<br>');
|
||||
return `<p>${html}</p>`
|
||||
.replace(/<p>(<(?:pre|ul|ol|h[1-6]|blockquote|hr)[^>]*>)/g, '$1')
|
||||
.replace(/(<\/(?:pre|ul|ol|h[1-6]|blockquote|hr)>)<\/p>/g, '$1');
|
||||
},
|
||||
|
||||
init(selector) {
|
||||
document.querySelectorAll(selector).forEach(el => {
|
||||
const raw = el.getAttribute('data-markdown') || el.textContent;
|
||||
el.innerHTML = markdown.render(raw);
|
||||
el.classList.add('lt-markdown');
|
||||
});
|
||||
},
|
||||
};
|
||||
|
||||
/* ================================================================
|
||||
MODULE 55 — PAGINATION
|
||||
lt.pagination.init(navEl, opts)
|
||||
@@ -3149,7 +3095,6 @@
|
||||
timer,
|
||||
lightbox,
|
||||
auth,
|
||||
markdown,
|
||||
ticketStatus,
|
||||
pagination,
|
||||
sidebarSubmenus: { init: initSidebarSubmenus },
|
||||
|
||||
+28
-12
@@ -140,25 +140,25 @@ document.addEventListener('DOMContentLoaded', function() {
|
||||
break;
|
||||
// Bulk operation perform actions
|
||||
case 'perform-bulk-assign':
|
||||
performBulkAssign();
|
||||
performBulkAssign(target);
|
||||
break;
|
||||
case 'close-bulk-assign-modal':
|
||||
closeBulkAssignModal();
|
||||
break;
|
||||
case 'perform-bulk-priority':
|
||||
performBulkPriority();
|
||||
performBulkPriority(target);
|
||||
break;
|
||||
case 'close-bulk-priority-modal':
|
||||
closeBulkPriorityModal();
|
||||
break;
|
||||
case 'perform-bulk-status':
|
||||
performBulkStatusChange();
|
||||
performBulkStatusChange(target);
|
||||
break;
|
||||
case 'close-bulk-status-modal':
|
||||
closeBulkStatusModal();
|
||||
break;
|
||||
case 'perform-bulk-close':
|
||||
performBulkCloseAction();
|
||||
performBulkCloseAction(undefined, target);
|
||||
break;
|
||||
case 'close-bulk-close-modal':
|
||||
closeBulkCloseModal();
|
||||
@@ -491,7 +491,10 @@ function closeBulkCloseModal() {
|
||||
if (modal) setTimeout(() => modal.remove(), 300);
|
||||
}
|
||||
|
||||
function performBulkCloseAction(ticketIds) {
|
||||
function performBulkCloseAction(ticketIds, btn) {
|
||||
if (btn && btn.disabled) return; // already in flight — guards against a double-click firing two requests
|
||||
if (btn) btn.disabled = true;
|
||||
|
||||
ticketIds = ticketIds || getSelectedTicketIds();
|
||||
const commentEl = document.getElementById('bulkCloseComment');
|
||||
const comment = commentEl ? commentEl.value.trim() : '';
|
||||
@@ -524,7 +527,8 @@ function performBulkCloseAction(ticketIds) {
|
||||
}
|
||||
closeBulkCloseModal();
|
||||
lt.toast.error('Bulk close failed: ' + error.message, 5000);
|
||||
});
|
||||
})
|
||||
.finally(() => { if (btn) btn.disabled = false; });
|
||||
}
|
||||
|
||||
var _bulkAssignUserId = null;
|
||||
@@ -596,7 +600,8 @@ function closeBulkAssignModal() {
|
||||
if (modal) setTimeout(() => modal.remove(), 300);
|
||||
}
|
||||
|
||||
function performBulkAssign() {
|
||||
function performBulkAssign(btn) {
|
||||
if (btn && btn.disabled) return; // already in flight — guards against a double-click firing two requests
|
||||
const userId = _bulkAssignUserId;
|
||||
const ticketIds = getSelectedTicketIds();
|
||||
|
||||
@@ -605,6 +610,8 @@ function performBulkAssign() {
|
||||
return;
|
||||
}
|
||||
|
||||
if (btn) btn.disabled = true;
|
||||
|
||||
lt.api.post('/api/bulk_operation.php', {
|
||||
operation_type: 'bulk_assign',
|
||||
ticket_ids: ticketIds,
|
||||
@@ -625,7 +632,8 @@ function performBulkAssign() {
|
||||
})
|
||||
.catch(error => {
|
||||
lt.toast.error('Bulk assign failed: ' + error.message, 5000);
|
||||
});
|
||||
})
|
||||
.finally(() => { if (btn) btn.disabled = false; });
|
||||
}
|
||||
|
||||
function showBulkPriorityModal() {
|
||||
@@ -672,7 +680,8 @@ function closeBulkPriorityModal() {
|
||||
if (modal) setTimeout(() => modal.remove(), 300);
|
||||
}
|
||||
|
||||
function performBulkPriority() {
|
||||
function performBulkPriority(btn) {
|
||||
if (btn && btn.disabled) return; // already in flight — guards against a double-click firing two requests
|
||||
const priorityEl = document.getElementById('bulkPriority');
|
||||
if (!priorityEl) return;
|
||||
const priority = priorityEl.value;
|
||||
@@ -683,6 +692,8 @@ function performBulkPriority() {
|
||||
return;
|
||||
}
|
||||
|
||||
if (btn) btn.disabled = true;
|
||||
|
||||
lt.api.post('/api/bulk_operation.php', {
|
||||
operation_type: 'bulk_priority',
|
||||
ticket_ids: ticketIds,
|
||||
@@ -703,7 +714,8 @@ function performBulkPriority() {
|
||||
})
|
||||
.catch(error => {
|
||||
lt.toast.error('Bulk priority update failed: ' + error.message, 5000);
|
||||
});
|
||||
})
|
||||
.finally(() => { if (btn) btn.disabled = false; });
|
||||
}
|
||||
|
||||
// Make table rows clickable
|
||||
@@ -786,7 +798,8 @@ function closeBulkStatusModal() {
|
||||
if (modal) setTimeout(() => modal.remove(), 300);
|
||||
}
|
||||
|
||||
function performBulkStatusChange() {
|
||||
function performBulkStatusChange(btn) {
|
||||
if (btn && btn.disabled) return; // already in flight — guards against a double-click firing two requests
|
||||
const bulkStatusEl = document.getElementById('bulkStatus');
|
||||
if (!bulkStatusEl) return;
|
||||
const status = bulkStatusEl.value;
|
||||
@@ -800,6 +813,8 @@ function performBulkStatusChange() {
|
||||
const commentEl = document.getElementById('bulkStatusComment');
|
||||
const comment = commentEl ? commentEl.value.trim() : '';
|
||||
|
||||
if (btn) btn.disabled = true;
|
||||
|
||||
lt.api.post('/api/bulk_operation.php', {
|
||||
operation_type: 'bulk_status',
|
||||
ticket_ids: ticketIds,
|
||||
@@ -829,7 +844,8 @@ function performBulkStatusChange() {
|
||||
}
|
||||
closeBulkStatusModal();
|
||||
lt.toast.error('Bulk status change failed: ' + error.message, 5000);
|
||||
});
|
||||
})
|
||||
.finally(() => { if (btn) btn.disabled = false; });
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -506,6 +506,25 @@ function toolbarHeading(textareaId) {
|
||||
textarea.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
}
|
||||
|
||||
function toolbarTable(textareaId) {
|
||||
const textarea = document.getElementById(textareaId);
|
||||
if (!textarea) return;
|
||||
|
||||
const start = textarea.selectionStart;
|
||||
const text = textarea.value;
|
||||
|
||||
// Insert on its own line(s), matching the blank-line-before convention
|
||||
// toolbarList/toolbarHeading rely on the surrounding text for — a table
|
||||
// needs a full line to itself both before and after the separator row.
|
||||
const needsLeadingNewline = start > 0 && text[start - 1] !== '\n';
|
||||
const template = (needsLeadingNewline ? '\n' : '')
|
||||
+ '| Header 1 | Header 2 |\n'
|
||||
+ '| --- | --- |\n'
|
||||
+ '| Cell 1 | Cell 2 |\n';
|
||||
|
||||
insertMarkdownText(textareaId, template);
|
||||
}
|
||||
|
||||
function toolbarQuote(textareaId) {
|
||||
const textarea = document.getElementById(textareaId);
|
||||
if (!textarea) return;
|
||||
@@ -544,6 +563,7 @@ function createEditorToolbar(textareaId, containerId) {
|
||||
<button type="button" data-toolbar-action="heading" data-textarea="${textareaId}" title="Heading">H</button>
|
||||
<button type="button" data-toolbar-action="list" data-textarea="${textareaId}" title="List">≡</button>
|
||||
<button type="button" data-toolbar-action="quote" data-textarea="${textareaId}" title="Quote">"</button>
|
||||
<button type="button" data-toolbar-action="table" data-textarea="${textareaId}" title="Table">▦</button>
|
||||
<span class="toolbar-separator"></span>
|
||||
<button type="button" data-toolbar-action="link" data-textarea="${textareaId}" title="Link">[ @ ]</button>
|
||||
`;
|
||||
@@ -563,6 +583,7 @@ function createEditorToolbar(textareaId, containerId) {
|
||||
case 'heading': toolbarHeading(targetId); break;
|
||||
case 'list': toolbarList(targetId); break;
|
||||
case 'quote': toolbarQuote(targetId); break;
|
||||
case 'table': toolbarTable(targetId); break;
|
||||
case 'link': toolbarLink(targetId); break;
|
||||
}
|
||||
});
|
||||
@@ -578,6 +599,7 @@ window.toolbarLink = toolbarLink;
|
||||
window.toolbarList = toolbarList;
|
||||
window.toolbarHeading = toolbarHeading;
|
||||
window.toolbarQuote = toolbarQuote;
|
||||
window.toolbarTable = toolbarTable;
|
||||
window.createEditorToolbar = createEditorToolbar;
|
||||
window.insertMarkdownFormat = insertMarkdownFormat;
|
||||
window.insertMarkdownText = insertMarkdownText;
|
||||
|
||||
+7
-6
@@ -713,12 +713,13 @@ function updateTicketStatus() {
|
||||
return;
|
||||
}
|
||||
cleanup(true);
|
||||
// Post comment first (persists it), then change status with the same
|
||||
// comment included so the server's requires_comment check passes.
|
||||
const ticketId = getTicketIdFromUrl();
|
||||
lt.api.post('/api/add_comment.php', { ticket_id: ticketId, comment_text: comment })
|
||||
.then(() => performStatusChange(statusSelect, selectedOption, newStatus, comment))
|
||||
.catch(() => performStatusChange(statusSelect, selectedOption, newStatus, comment));
|
||||
// The comment is sent as part of the status-change request itself
|
||||
// (update_ticket.php persists it in the same DB transaction as the
|
||||
// status update) rather than as a separate prior add_comment.php
|
||||
// call — previously those were two independent, non-transactional
|
||||
// writes, so a failure partway through could leave the "reason"
|
||||
// comment persisted with no matching status change ever applied.
|
||||
performStatusChange(statusSelect, selectedOption, newStatus, comment);
|
||||
});
|
||||
// Focus textarea on open
|
||||
setTimeout(() => { const ta = document.getElementById(`${modalId}_comment`); if (ta) ta.focus(); }, 100);
|
||||
|
||||
+315
-263
@@ -232,301 +232,353 @@ $priority = (int)$priority;
|
||||
$ticketHash = generateTicketHash($data);
|
||||
$auditLog = new AuditLogModel($conn);
|
||||
|
||||
// Look up any existing ticket with this hash (open OR closed)
|
||||
$checkStmt = $conn->prepare("SELECT ticket_id, status, title, priority FROM tickets WHERE hash = ? ORDER BY created_at DESC LIMIT 1");
|
||||
$checkStmt->bind_param("s", $ticketHash);
|
||||
$checkStmt->execute();
|
||||
$existing = $checkStmt->get_result()->fetch_assoc();
|
||||
$checkStmt->close();
|
||||
// Everything from here through either updating/reopening the matched ticket
|
||||
// or inserting a brand-new one runs inside one transaction with a row lock
|
||||
// on the hash lookup. Without this, two concurrent requests carrying the
|
||||
// same dedup hash (e.g. overlapping monitoring runs) could both read the
|
||||
// same pre-update snapshot and each independently apply an escalation. FOR
|
||||
// UPDATE on this equality lookup against the unique-indexed hash column also
|
||||
// takes a lock on the "gap" where no row currently exists, so two concurrent
|
||||
// requests for a genuinely new hash are still safe from a duplicate row —
|
||||
// but that gap lock is shared, not exclusive, so both can reach the INSERT
|
||||
// below and deadlock with each other rather than one blocking cleanly on the
|
||||
// other's row. See the retry loop and comment near the INSERT's catch block
|
||||
// for how that case is handled.
|
||||
// Retried once if the INSERT below deadlocks with another connection's
|
||||
// concurrent insert into the same not-yet-existing hash (see comment
|
||||
// above the INSERT's catch block) — the retry's own SELECT ... FOR UPDATE
|
||||
// will then find the winner's already-committed row and take the
|
||||
// update/escalate branch instead of erroring out.
|
||||
$maxDedupAttempts = 2;
|
||||
for ($dedupAttempt = 1; $dedupAttempt <= $maxDedupAttempts; $dedupAttempt++) {
|
||||
$conn->begin_transaction();
|
||||
|
||||
if ($existing) {
|
||||
$existingId = $existing['ticket_id'];
|
||||
$existingStatus = $existing['status'];
|
||||
$existingTitle = $existing['title'];
|
||||
$existingPriority = (int)$existing['priority'];
|
||||
$newPriority = (int)$priority;
|
||||
// Look up any existing ticket with this hash (open OR closed)
|
||||
$checkStmt = $conn->prepare("SELECT ticket_id, status, title, priority FROM tickets WHERE hash = ? ORDER BY created_at DESC LIMIT 1 FOR UPDATE");
|
||||
$checkStmt->bind_param("s", $ticketHash);
|
||||
$checkStmt->execute();
|
||||
$existing = $checkStmt->get_result()->fetch_assoc();
|
||||
$checkStmt->close();
|
||||
|
||||
if ($existingStatus !== 'Closed') {
|
||||
// Ticket is still active — update title, escalate priority, and refresh
|
||||
// description with latest sensor data.
|
||||
$changes = [];
|
||||
$updateSql = "UPDATE tickets SET updated_at = NOW(), updated_by = ?";
|
||||
$bindTypes = "i";
|
||||
$bindVals = [$userId];
|
||||
if ($existing) {
|
||||
$existingId = $existing['ticket_id'];
|
||||
$existingStatus = $existing['status'];
|
||||
$existingTitle = $existing['title'];
|
||||
$existingPriority = (int)$existing['priority'];
|
||||
$newPriority = (int)$priority;
|
||||
|
||||
if ($title !== $existingTitle) {
|
||||
$updateSql .= ", title = ?";
|
||||
$bindTypes .= "s";
|
||||
$bindVals[] = $title;
|
||||
$changes['title'] = ['from' => $existingTitle, 'to' => $title];
|
||||
}
|
||||
if ($existingStatus !== 'Closed') {
|
||||
// Ticket is still active — update title, escalate priority, and refresh
|
||||
// description with latest sensor data.
|
||||
$changes = [];
|
||||
$updateSql = "UPDATE tickets SET updated_at = NOW(), updated_by = ?";
|
||||
$bindTypes = "i";
|
||||
$bindVals = [$userId];
|
||||
|
||||
if ($newPriority < $existingPriority) {
|
||||
$updateSql .= ", priority = ?";
|
||||
$bindTypes .= "i";
|
||||
$bindVals[] = $newPriority;
|
||||
$changes['priority'] = ['from' => $existingPriority, 'to' => $newPriority];
|
||||
}
|
||||
|
||||
// Always refresh the description so the ticket body shows current sensor data
|
||||
if (!empty($description)) {
|
||||
$updateSql .= ", description = ?";
|
||||
$bindTypes .= "s";
|
||||
$bindVals[] = $description;
|
||||
$changes['description_refreshed'] = true;
|
||||
}
|
||||
|
||||
if (!empty($changes)) {
|
||||
$updateSql .= " WHERE ticket_id = ?";
|
||||
$bindTypes .= "s";
|
||||
$bindVals[] = $existingId;
|
||||
|
||||
$updStmt = $conn->prepare($updateSql);
|
||||
$updStmt->bind_param($bindTypes, ...$bindVals);
|
||||
$updStmt->execute();
|
||||
$updStmt->close();
|
||||
|
||||
// Only post a comment on priority escalation — title and description updates
|
||||
// are silent (title changes like rising counters would spam a comment every run).
|
||||
// Keep it short: the full sensor data is refreshed in the ticket description,
|
||||
// so the comment just records the bump + a brief reason (no ASCII dump).
|
||||
if (isset($changes['priority'])) {
|
||||
$pLabels = [1 => 'P1 (Critical)', 2 => 'P2 (High)', 3 => 'P3 (Medium)', 4 => 'P4 (Low)', 5 => 'P5 (Minimal)'];
|
||||
$fromP = (int)$changes['priority']['from'];
|
||||
$toP = (int)$changes['priority']['to'];
|
||||
$fromL = $pLabels[$fromP] ?? "P{$fromP}";
|
||||
$toL = $pLabels[$toP] ?? "P{$toP}";
|
||||
$commentText = "**hwmonDaemon raised priority {$fromL} → {$toL}.**\n\n"
|
||||
. "The latest monitoring scan reported a more severe condition for this issue, "
|
||||
. "so it now needs faster attention. Current sensor data is in the ticket description above.";
|
||||
$commentStmt = $conn->prepare(
|
||||
"INSERT INTO ticket_comments (ticket_id, user_id, user_name, comment_text, markdown_enabled) VALUES (?, ?, 'hwmonDaemon', ?, 1)"
|
||||
);
|
||||
$commentStmt->bind_param("sis", $existingId, $userId, $commentText);
|
||||
$commentStmt->execute();
|
||||
$commentStmt->close();
|
||||
if ($title !== $existingTitle) {
|
||||
$updateSql .= ", title = ?";
|
||||
$bindTypes .= "s";
|
||||
$bindVals[] = $title;
|
||||
$changes['title'] = ['from' => $existingTitle, 'to' => $title];
|
||||
}
|
||||
|
||||
$auditLog->log($userId, 'update', 'ticket', $existingId, array_merge(
|
||||
array_diff_key($changes, ['description_refreshed' => true]),
|
||||
['reason' => 'auto-updated by hwmonDaemon (condition worsened)']
|
||||
));
|
||||
|
||||
// Only notify on priority escalation — title-only updates (e.g. rising
|
||||
// Power_On_Hours counter) should not generate a Matrix ping every hour.
|
||||
if (isset($changes['priority'])) {
|
||||
require_once __DIR__ . '/helpers/NotificationHelper.php';
|
||||
NotificationHelper::sendTicketNotification($existingId, [
|
||||
'title' => $title,
|
||||
'priority' => $changes['priority']['to'],
|
||||
'category' => $category,
|
||||
'type' => $type,
|
||||
'status' => $existingStatus,
|
||||
], 'automated');
|
||||
if ($newPriority < $existingPriority) {
|
||||
$updateSql .= ", priority = ?";
|
||||
$bindTypes .= "i";
|
||||
$bindVals[] = $newPriority;
|
||||
$changes['priority'] = ['from' => $existingPriority, 'to' => $newPriority];
|
||||
}
|
||||
|
||||
// Ticket state (priority/title/description) changed — refresh dashboard stats.
|
||||
// Always refresh the description so the ticket body shows current sensor data
|
||||
if (!empty($description)) {
|
||||
$updateSql .= ", description = ?";
|
||||
$bindTypes .= "s";
|
||||
$bindVals[] = $description;
|
||||
$changes['description_refreshed'] = true;
|
||||
}
|
||||
|
||||
if (!empty($changes)) {
|
||||
$updateSql .= " WHERE ticket_id = ?";
|
||||
$bindTypes .= "s";
|
||||
$bindVals[] = $existingId;
|
||||
|
||||
$updStmt = $conn->prepare($updateSql);
|
||||
$updStmt->bind_param($bindTypes, ...$bindVals);
|
||||
$updStmt->execute();
|
||||
$updStmt->close();
|
||||
|
||||
// Only post a comment on priority escalation — title and description updates
|
||||
// are silent (title changes like rising counters would spam a comment every run).
|
||||
// Keep it short: the full sensor data is refreshed in the ticket description,
|
||||
// so the comment just records the bump + a brief reason (no ASCII dump).
|
||||
if (isset($changes['priority'])) {
|
||||
$pLabels = [1 => 'P1 (Critical)', 2 => 'P2 (High)', 3 => 'P3 (Medium)', 4 => 'P4 (Low)', 5 => 'P5 (Minimal)'];
|
||||
$fromP = (int)$changes['priority']['from'];
|
||||
$toP = (int)$changes['priority']['to'];
|
||||
$fromL = $pLabels[$fromP] ?? "P{$fromP}";
|
||||
$toL = $pLabels[$toP] ?? "P{$toP}";
|
||||
$commentText = "**hwmonDaemon raised priority {$fromL} → {$toL}.**\n\n"
|
||||
. "The latest monitoring scan reported a more severe condition for this issue, "
|
||||
. "so it now needs faster attention. Current sensor data is in the ticket description above.";
|
||||
$commentStmt = $conn->prepare(
|
||||
"INSERT INTO ticket_comments (ticket_id, user_id, user_name, comment_text, markdown_enabled) VALUES (?, ?, 'hwmonDaemon', ?, 1)"
|
||||
);
|
||||
$commentStmt->bind_param("sis", $existingId, $userId, $commentText);
|
||||
$commentStmt->execute();
|
||||
$commentStmt->close();
|
||||
}
|
||||
|
||||
$auditLog->log($userId, 'update', 'ticket', $existingId, array_merge(
|
||||
array_diff_key($changes, ['description_refreshed' => true]),
|
||||
['reason' => 'auto-updated by hwmonDaemon (condition worsened)']
|
||||
));
|
||||
|
||||
// Only notify on priority escalation — title-only updates (e.g. rising
|
||||
// Power_On_Hours counter) should not generate a Matrix ping every hour.
|
||||
if (isset($changes['priority'])) {
|
||||
require_once __DIR__ . '/helpers/NotificationHelper.php';
|
||||
NotificationHelper::sendTicketNotification($existingId, [
|
||||
'title' => $title,
|
||||
'priority' => $changes['priority']['to'],
|
||||
'category' => $category,
|
||||
'type' => $type,
|
||||
'status' => $existingStatus,
|
||||
], 'automated');
|
||||
}
|
||||
|
||||
// Ticket state (priority/title/description) changed — refresh dashboard stats.
|
||||
(new StatsModel($conn))->invalidateCache();
|
||||
}
|
||||
|
||||
$conn->commit();
|
||||
Database::close();
|
||||
echo json_encode([
|
||||
'success' => true,
|
||||
'ticket_id' => $existingId,
|
||||
'message' => empty($changes) ? 'Duplicate — no change' : 'Existing ticket updated',
|
||||
'action' => empty($changes) ? 'deduplicated' : 'updated',
|
||||
'changes' => $changes,
|
||||
]);
|
||||
exit;
|
||||
}
|
||||
|
||||
// Ticket was closed — reopen it and add a recurrence comment. Route
|
||||
// through the Workflow Designer like every other status-write path in
|
||||
// the app, rather than forcing status='Open' via raw SQL regardless of
|
||||
// configured transition rules.
|
||||
$workflowModel = new WorkflowModel($conn);
|
||||
$reopenStatus = 'Open';
|
||||
if (!$workflowModel->isTransitionAllowed('Closed', 'Open', false)) {
|
||||
// Direct Closed->Open isn't configured — fall back to any transition
|
||||
// the Workflow Designer does allow from Closed that this unattended,
|
||||
// non-admin automation can actually satisfy (no comment prompt, no
|
||||
// admin elevation). If even that doesn't exist, leave the ticket
|
||||
// Closed rather than force an unconfigured state.
|
||||
$reopenStatus = null;
|
||||
foreach ($workflowModel->getAllowedTransitions('Closed') as $transition) {
|
||||
if (!$transition['requires_comment'] && !$transition['requires_admin']) {
|
||||
$reopenStatus = $transition['to_status'];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($reopenStatus !== null) {
|
||||
$ticketModel = new TicketModel($conn);
|
||||
$ticketModel->updateTicket([
|
||||
'ticket_id' => $existingId,
|
||||
'title' => $title,
|
||||
'description' => $description,
|
||||
'category' => $category,
|
||||
'type' => $type,
|
||||
'status' => $reopenStatus,
|
||||
'priority' => $priority,
|
||||
], $userId);
|
||||
} else {
|
||||
error_log("create_ticket_api: hwmonDaemon recurrence for ticket $existingId — "
|
||||
. "no admin-free, comment-free transition from Closed is configured; leaving ticket Closed");
|
||||
}
|
||||
|
||||
$commentText = "**Issue recurred — ticket reopened automatically.**\n\n" .
|
||||
"hwmonDaemon detected this condition again. The ticket description reflects the "
|
||||
. "original report; see this comment's timestamp for when the issue recurred.";
|
||||
if ($reopenStatus === null) {
|
||||
$commentText = "**Issue recurred, but the ticket could not be reopened automatically.**\n\n"
|
||||
. "hwmonDaemon detected this condition again. No Workflow Designer transition from "
|
||||
. "Closed is configured that this automation can perform unattended (no comment/admin "
|
||||
. "requirement); the ticket remains Closed. Please review and reopen manually if appropriate.";
|
||||
}
|
||||
$commentStmt = $conn->prepare(
|
||||
"INSERT INTO ticket_comments (ticket_id, user_id, user_name, comment_text, markdown_enabled) VALUES (?, ?, 'hwmonDaemon', ?, 1)"
|
||||
);
|
||||
$commentStmt->bind_param("sis", $existingId, $userId, $commentText);
|
||||
$commentStmt->execute();
|
||||
$commentStmt->close();
|
||||
|
||||
if ($reopenStatus !== null) {
|
||||
$auditLog->log($userId, 'update', 'ticket', $existingId, [
|
||||
'status' => ['from' => 'Closed', 'to' => $reopenStatus],
|
||||
'reason' => 'auto-reopened by hwmonDaemon (issue recurred)',
|
||||
]);
|
||||
|
||||
// Ticket reopened — refresh dashboard stats.
|
||||
(new StatsModel($conn))->invalidateCache();
|
||||
} else {
|
||||
$auditLog->log($userId, 'update', 'ticket', $existingId, [
|
||||
'reason' => 'hwmonDaemon recurrence detected but no valid reopen transition configured; ticket left Closed',
|
||||
]);
|
||||
}
|
||||
|
||||
$conn->commit();
|
||||
Database::close();
|
||||
|
||||
if ($reopenStatus !== null) {
|
||||
require_once __DIR__ . '/helpers/NotificationHelper.php';
|
||||
NotificationHelper::sendTicketNotification($existingId, [
|
||||
'title' => $title,
|
||||
'priority' => $priority,
|
||||
'category' => $category,
|
||||
'type' => $type,
|
||||
'status' => $reopenStatus,
|
||||
], 'automated');
|
||||
}
|
||||
|
||||
echo json_encode([
|
||||
'success' => true,
|
||||
'ticket_id' => $existingId,
|
||||
'message' => empty($changes) ? 'Duplicate — no change' : 'Existing ticket updated',
|
||||
'action' => empty($changes) ? 'deduplicated' : 'updated',
|
||||
'changes' => $changes,
|
||||
'success' => true,
|
||||
'ticket_id' => $existingId,
|
||||
'message' => $reopenStatus !== null
|
||||
? 'Existing closed ticket reopened'
|
||||
: 'Recurrence noted; ticket left Closed (no valid workflow transition configured)',
|
||||
'action' => $reopenStatus !== null ? 'reopened' : 'recurrence_noted',
|
||||
]);
|
||||
exit;
|
||||
}
|
||||
|
||||
// Ticket was closed — reopen it and add a recurrence comment. Route
|
||||
// through the Workflow Designer like every other status-write path in
|
||||
// the app, rather than forcing status='Open' via raw SQL regardless of
|
||||
// configured transition rules.
|
||||
$workflowModel = new WorkflowModel($conn);
|
||||
$reopenStatus = 'Open';
|
||||
if (!$workflowModel->isTransitionAllowed('Closed', 'Open', false)) {
|
||||
// Direct Closed->Open isn't configured — fall back to any transition
|
||||
// the Workflow Designer does allow from Closed that this unattended,
|
||||
// non-admin automation can actually satisfy (no comment prompt, no
|
||||
// admin elevation). If even that doesn't exist, leave the ticket
|
||||
// Closed rather than force an unconfigured state.
|
||||
$reopenStatus = null;
|
||||
foreach ($workflowModel->getAllowedTransitions('Closed') as $transition) {
|
||||
if (!$transition['requires_comment'] && !$transition['requires_admin']) {
|
||||
$reopenStatus = $transition['to_status'];
|
||||
break;
|
||||
}
|
||||
// No existing ticket — create a new one. Still inside the transaction opened
|
||||
// above, so a concurrent request for the same hash is blocked on its own
|
||||
// SELECT ... FOR UPDATE until this one commits or rolls back (see comment
|
||||
// there) rather than racing this INSERT.
|
||||
//
|
||||
// Note on FOR UPDATE over a not-yet-existing key: InnoDB's gap lock in that
|
||||
// case is a shared lock, not exclusive — two concurrent transactions can
|
||||
// both acquire it and both reach this INSERT. The conflict only surfaces
|
||||
// when they each request the insert-intention lock for the same gap,
|
||||
// which InnoDB resolves as a deadlock (error 1213), not by blocking one
|
||||
// of the SELECTs. The outer loop above retries that case: the loser rolls
|
||||
// back and re-runs its own SELECT ... FOR UPDATE, which by then finds the
|
||||
// winner's committed row and takes the update/escalate branch instead.
|
||||
//
|
||||
// Generate a collision-safe unique ticket_id with a pre-check + retry loop (same
|
||||
// approach as TicketModel::createTicket) so a ticket_id clash cannot happen. That
|
||||
// way a 1062 on INSERT below can only be the unique_hash (dedup) key — and with
|
||||
// the FOR UPDATE lock above, only in the unlikely case of a hash collision from
|
||||
// two genuinely different reports, not the same-hash race this used to be.
|
||||
$ticket_id = null;
|
||||
$maxAttempts = 50;
|
||||
$attempts = 0;
|
||||
do {
|
||||
try {
|
||||
$candidateId = sprintf('%09d', random_int(100000000, 999999999));
|
||||
} catch (Exception $e) {
|
||||
$candidateId = sprintf('%09d', mt_rand(100000000, 999999999));
|
||||
}
|
||||
|
||||
$idCheckStmt = $conn->prepare("SELECT ticket_id FROM tickets WHERE ticket_id = ? LIMIT 1");
|
||||
$idCheckStmt->bind_param("s", $candidateId);
|
||||
$idCheckStmt->execute();
|
||||
$idExists = $idCheckStmt->get_result()->num_rows > 0;
|
||||
$idCheckStmt->close();
|
||||
|
||||
if (!$idExists) {
|
||||
$ticket_id = $candidateId;
|
||||
}
|
||||
$attempts++;
|
||||
} while ($ticket_id === null && $attempts < $maxAttempts);
|
||||
|
||||
if ($ticket_id === null) {
|
||||
$conn->rollback();
|
||||
error_log('create_ticket_api: failed to generate a unique ticket_id after ' . $maxAttempts . ' attempts');
|
||||
http_response_code(500);
|
||||
echo json_encode(['success' => false, 'error' => 'Internal server error']);
|
||||
exit;
|
||||
}
|
||||
|
||||
if ($reopenStatus !== null) {
|
||||
$ticketModel = new TicketModel($conn);
|
||||
$ticketModel->updateTicket([
|
||||
'ticket_id' => $existingId,
|
||||
'title' => $title,
|
||||
'description' => $description,
|
||||
'category' => $category,
|
||||
'type' => $type,
|
||||
'status' => $reopenStatus,
|
||||
'priority' => $priority,
|
||||
], $userId);
|
||||
} else {
|
||||
error_log("create_ticket_api: hwmonDaemon recurrence for ticket $existingId — "
|
||||
. "no admin-free, comment-free transition from Closed is configured; leaving ticket Closed");
|
||||
}
|
||||
|
||||
$commentText = "**Issue recurred — ticket reopened automatically.**\n\n" .
|
||||
"hwmonDaemon detected this condition again. The ticket description reflects the "
|
||||
. "original report; see this comment's timestamp for when the issue recurred.";
|
||||
if ($reopenStatus === null) {
|
||||
$commentText = "**Issue recurred, but the ticket could not be reopened automatically.**\n\n"
|
||||
. "hwmonDaemon detected this condition again. No Workflow Designer transition from "
|
||||
. "Closed is configured that this automation can perform unattended (no comment/admin "
|
||||
. "requirement); the ticket remains Closed. Please review and reopen manually if appropriate.";
|
||||
}
|
||||
$commentStmt = $conn->prepare(
|
||||
"INSERT INTO ticket_comments (ticket_id, user_id, user_name, comment_text, markdown_enabled) VALUES (?, ?, 'hwmonDaemon', ?, 1)"
|
||||
$insertStmt = $conn->prepare(
|
||||
"INSERT INTO tickets (ticket_id, title, description, status, priority, category, type, hash, created_by)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"
|
||||
);
|
||||
$insertStmt->bind_param(
|
||||
"ssssssssi",
|
||||
$ticket_id,
|
||||
$title,
|
||||
$description,
|
||||
$status,
|
||||
$priority,
|
||||
$category,
|
||||
$type,
|
||||
$ticketHash,
|
||||
$userId
|
||||
);
|
||||
$commentStmt->bind_param("sis", $existingId, $userId, $commentText);
|
||||
$commentStmt->execute();
|
||||
$commentStmt->close();
|
||||
|
||||
if ($reopenStatus !== null) {
|
||||
$auditLog->log($userId, 'update', 'ticket', $existingId, [
|
||||
'status' => ['from' => 'Closed', 'to' => $reopenStatus],
|
||||
'reason' => 'auto-reopened by hwmonDaemon (issue recurred)',
|
||||
]);
|
||||
|
||||
// Ticket reopened — refresh dashboard stats.
|
||||
(new StatsModel($conn))->invalidateCache();
|
||||
} else {
|
||||
$auditLog->log($userId, 'update', 'ticket', $existingId, [
|
||||
'reason' => 'hwmonDaemon recurrence detected but no valid reopen transition configured; ticket left Closed',
|
||||
]);
|
||||
try {
|
||||
$inserted = $insertStmt->execute();
|
||||
} catch (mysqli_sql_exception $e) {
|
||||
$insertStmt->close();
|
||||
$conn->rollback();
|
||||
if (in_array($e->getCode(), [1213, 1205], true) && $dedupAttempt < $maxDedupAttempts) {
|
||||
// Deadlock (1213) or lock wait timeout (1205) from a concurrent
|
||||
// insert into the same not-yet-existing hash gap — see the note
|
||||
// above. Retry: the next iteration's own SELECT ... FOR UPDATE
|
||||
// will find whichever side won and take the update/escalate path.
|
||||
continue;
|
||||
}
|
||||
if ($e->getCode() === 1062) {
|
||||
// Should be unreachable in the same-hash race this issue was filed
|
||||
// for now that the SELECT above takes FOR UPDATE — kept as a
|
||||
// defensive fallback in case of a genuine hash collision between two
|
||||
// different reports.
|
||||
echo json_encode(['success' => false, 'error' => 'Duplicate ticket']);
|
||||
} else {
|
||||
error_log('create_ticket_api: insert failed: ' . $e->getMessage());
|
||||
http_response_code(500);
|
||||
echo json_encode(['success' => false, 'error' => 'Internal server error']);
|
||||
}
|
||||
exit;
|
||||
}
|
||||
$insertStmt->close();
|
||||
|
||||
Database::close();
|
||||
|
||||
if ($reopenStatus !== null) {
|
||||
require_once __DIR__ . '/helpers/NotificationHelper.php';
|
||||
NotificationHelper::sendTicketNotification($existingId, [
|
||||
if ($inserted) {
|
||||
$auditLog->logTicketCreate($userId, $ticket_id, [
|
||||
'title' => $title,
|
||||
'priority' => $priority,
|
||||
'category' => $category,
|
||||
'type' => $type,
|
||||
'status' => $reopenStatus,
|
||||
]);
|
||||
|
||||
// New ticket created — refresh dashboard stats.
|
||||
(new StatsModel($conn))->invalidateCache();
|
||||
|
||||
$conn->commit();
|
||||
Database::close();
|
||||
|
||||
require_once __DIR__ . '/helpers/NotificationHelper.php';
|
||||
NotificationHelper::sendTicketNotification($ticket_id, [
|
||||
'title' => $title,
|
||||
'priority' => $priority,
|
||||
'category' => $category,
|
||||
'type' => $type,
|
||||
'status' => $status,
|
||||
], 'automated');
|
||||
}
|
||||
|
||||
echo json_encode([
|
||||
'success' => true,
|
||||
'ticket_id' => $existingId,
|
||||
'message' => $reopenStatus !== null
|
||||
? 'Existing closed ticket reopened'
|
||||
: 'Recurrence noted; ticket left Closed (no valid workflow transition configured)',
|
||||
'action' => $reopenStatus !== null ? 'reopened' : 'recurrence_noted',
|
||||
]);
|
||||
exit;
|
||||
}
|
||||
|
||||
// No existing ticket — create a new one.
|
||||
// Generate a collision-safe unique ticket_id with a pre-check + retry loop (same
|
||||
// approach as TicketModel::createTicket) so a ticket_id clash cannot happen. That
|
||||
// way a 1062 on INSERT below can only be the unique_hash (dedup) key racing, and
|
||||
// is correctly reported as a duplicate rather than a dropped hardware alert.
|
||||
$ticket_id = null;
|
||||
$maxAttempts = 50;
|
||||
$attempts = 0;
|
||||
do {
|
||||
try {
|
||||
$candidateId = sprintf('%09d', random_int(100000000, 999999999));
|
||||
} catch (Exception $e) {
|
||||
$candidateId = sprintf('%09d', mt_rand(100000000, 999999999));
|
||||
}
|
||||
|
||||
$idCheckStmt = $conn->prepare("SELECT ticket_id FROM tickets WHERE ticket_id = ? LIMIT 1");
|
||||
$idCheckStmt->bind_param("s", $candidateId);
|
||||
$idCheckStmt->execute();
|
||||
$idExists = $idCheckStmt->get_result()->num_rows > 0;
|
||||
$idCheckStmt->close();
|
||||
|
||||
if (!$idExists) {
|
||||
$ticket_id = $candidateId;
|
||||
}
|
||||
$attempts++;
|
||||
} while ($ticket_id === null && $attempts < $maxAttempts);
|
||||
|
||||
if ($ticket_id === null) {
|
||||
error_log('create_ticket_api: failed to generate a unique ticket_id after ' . $maxAttempts . ' attempts');
|
||||
http_response_code(500);
|
||||
echo json_encode(['success' => false, 'error' => 'Internal server error']);
|
||||
exit;
|
||||
}
|
||||
|
||||
$insertStmt = $conn->prepare(
|
||||
"INSERT INTO tickets (ticket_id, title, description, status, priority, category, type, hash, created_by)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"
|
||||
);
|
||||
$insertStmt->bind_param(
|
||||
"ssssssssi",
|
||||
$ticket_id,
|
||||
$title,
|
||||
$description,
|
||||
$status,
|
||||
$priority,
|
||||
$category,
|
||||
$type,
|
||||
$ticketHash,
|
||||
$userId
|
||||
);
|
||||
|
||||
try {
|
||||
$inserted = $insertStmt->execute();
|
||||
} catch (mysqli_sql_exception $e) {
|
||||
$insertStmt->close();
|
||||
if ($e->getCode() === 1062) {
|
||||
// Race condition: another node inserted the same hash between our SELECT and INSERT
|
||||
echo json_encode(['success' => false, 'error' => 'Duplicate ticket']);
|
||||
echo json_encode([
|
||||
'success' => true,
|
||||
'ticket_id' => $ticket_id,
|
||||
'message' => 'Ticket created successfully',
|
||||
]);
|
||||
} else {
|
||||
error_log('create_ticket_api: insert failed: ' . $e->getMessage());
|
||||
$conn->rollback();
|
||||
error_log('create_ticket_api: ticket insert reported failure: ' . $conn->error);
|
||||
http_response_code(500);
|
||||
echo json_encode(['success' => false, 'error' => 'Internal server error']);
|
||||
}
|
||||
exit;
|
||||
}
|
||||
$insertStmt->close();
|
||||
|
||||
if ($inserted) {
|
||||
$auditLog->logTicketCreate($userId, $ticket_id, [
|
||||
'title' => $title,
|
||||
'priority' => $priority,
|
||||
'category' => $category,
|
||||
'type' => $type,
|
||||
]);
|
||||
|
||||
// New ticket created — refresh dashboard stats.
|
||||
(new StatsModel($conn))->invalidateCache();
|
||||
|
||||
Database::close();
|
||||
|
||||
require_once __DIR__ . '/helpers/NotificationHelper.php';
|
||||
NotificationHelper::sendTicketNotification($ticket_id, [
|
||||
'title' => $title,
|
||||
'priority' => $priority,
|
||||
'category' => $category,
|
||||
'type' => $type,
|
||||
'status' => $status,
|
||||
], 'automated');
|
||||
|
||||
echo json_encode([
|
||||
'success' => true,
|
||||
'ticket_id' => $ticket_id,
|
||||
'message' => 'Ticket created successfully',
|
||||
]);
|
||||
} else {
|
||||
error_log('create_ticket_api: ticket insert reported failure: ' . $conn->error);
|
||||
http_response_code(500);
|
||||
echo json_encode(['success' => false, 'error' => 'Internal server error']);
|
||||
}
|
||||
|
||||
@@ -33,6 +33,23 @@ class BulkOperationsModel
|
||||
return $this->workflowModel;
|
||||
}
|
||||
|
||||
/**
|
||||
* Re-fetch a ticket row inside the current transaction with a row lock
|
||||
* (FOR UPDATE), so a concurrent transaction touching the same row blocks
|
||||
* until this one commits or rolls back instead of both validating
|
||||
* against the same stale snapshot. Must be called after
|
||||
* begin_transaction() and before the row is written.
|
||||
*/
|
||||
private function lockTicketForUpdate(string $ticketId): ?array
|
||||
{
|
||||
$stmt = $this->conn->prepare("SELECT * FROM tickets WHERE ticket_id = ? FOR UPDATE");
|
||||
$stmt->bind_param('s', $ticketId);
|
||||
$stmt->execute();
|
||||
$row = $stmt->get_result()->fetch_assoc();
|
||||
$stmt->close();
|
||||
return $row ?: null;
|
||||
}
|
||||
|
||||
/**
|
||||
* The status a bulk operation is trying to move tickets into, or null for
|
||||
* operations that don't change status.
|
||||
@@ -89,12 +106,18 @@ class BulkOperationsModel
|
||||
/**
|
||||
* Process a bulk operation
|
||||
*
|
||||
* Uses database transaction to ensure atomicity - either all tickets
|
||||
* are updated or none are (on failure, changes are rolled back).
|
||||
* Runs the whole batch inside one database transaction, but by default
|
||||
* ($atomic = false, which is what api/bulk_operation.php uses) that
|
||||
* transaction is always committed: a per-ticket failure (e.g. a
|
||||
* disallowed workflow transition) is recorded in $failed/$errors and
|
||||
* skipped, while every other ticket in the batch still succeeds. This
|
||||
* is a best-effort batch, not an all-or-nothing one — set $atomic to
|
||||
* true to roll back the entire batch when any ticket fails.
|
||||
*
|
||||
* @param int $operationId Operation ID
|
||||
* @param bool $atomic If true, rollback all changes on any failure
|
||||
* @return array Result with processed and failed counts
|
||||
* @return array Result with processed/failed counts and an errors[] list of
|
||||
* per-ticket failure reasons (surfaced to the admin by the caller)
|
||||
*/
|
||||
public function processBulkOperation($operationId, bool $atomic = false)
|
||||
{
|
||||
@@ -183,13 +206,27 @@ class BulkOperationsModel
|
||||
$success = false;
|
||||
|
||||
try {
|
||||
// Re-fetch and row-lock the ticket inside the transaction for any
|
||||
// operation that validates against or reads its current fields —
|
||||
// the pre-transaction $ticketsById snapshot (loaded before
|
||||
// begin_transaction()) can be stale by the time we get here if a
|
||||
// concurrent request (a single-ticket edit, or another bulk op)
|
||||
// changed the row in between. Validating a transition against a
|
||||
// stale status, or writing back stale title/description/etc.,
|
||||
// could silently bypass Workflow Designer rules or clobber a
|
||||
// concurrent edit. FOR UPDATE blocks a concurrent transaction
|
||||
// from reading/writing this row until ours commits or rolls back.
|
||||
$needsCurrentTicket = $targetStatus !== null || $operation['operation_type'] === 'bulk_priority';
|
||||
$currentTicket = $needsCurrentTicket
|
||||
? $this->lockTicketForUpdate($ticketId)
|
||||
: ($ticketsById[$ticketId] ?? null);
|
||||
|
||||
// bulk_status / bulk_close enforce the same Workflow Designer
|
||||
// rules as the single-ticket path: a transition the designer
|
||||
// doesn't define is refused, and requires_comment is honoured
|
||||
// (checked up front, above). requires_admin is satisfied because
|
||||
// api/bulk_operation.php already gates the endpoint on admin.
|
||||
if ($targetStatus !== null) {
|
||||
$currentTicket = $ticketsById[$ticketId] ?? null;
|
||||
if ($currentTicket && $currentTicket['status'] === $targetStatus) {
|
||||
// Already in the requested state — nothing to do, and
|
||||
// reporting a no-op as a failure would just confuse.
|
||||
@@ -211,8 +248,7 @@ class BulkOperationsModel
|
||||
|
||||
switch ($operation['operation_type']) {
|
||||
case 'bulk_close':
|
||||
// Get current ticket from pre-loaded batch
|
||||
$currentTicket = $ticketsById[$ticketId] ?? null;
|
||||
// $currentTicket is the fresh, row-locked read from above.
|
||||
if ($currentTicket) {
|
||||
$updateResult = $ticketModel->updateTicket([
|
||||
'ticket_id' => $ticketId,
|
||||
@@ -264,7 +300,7 @@ class BulkOperationsModel
|
||||
|
||||
case 'bulk_priority':
|
||||
if (isset($parameters['priority'])) {
|
||||
$currentTicket = $ticketsById[$ticketId] ?? null;
|
||||
// $currentTicket is the fresh, row-locked read from above.
|
||||
if ($currentTicket) {
|
||||
$updateResult = $ticketModel->updateTicket([
|
||||
'ticket_id' => $ticketId,
|
||||
@@ -292,7 +328,7 @@ class BulkOperationsModel
|
||||
|
||||
case 'bulk_status':
|
||||
if (isset($parameters['status'])) {
|
||||
$currentTicket = $ticketsById[$ticketId] ?? null;
|
||||
// $currentTicket is the fresh, row-locked read from above.
|
||||
if ($currentTicket) {
|
||||
$updateResult = $ticketModel->updateTicket([
|
||||
'ticket_id' => $ticketId,
|
||||
|
||||
Reference in New Issue
Block a user