Compare commits

..

1 Commits

Author SHA1 Message Date
Alexander Whitestone
cf23e93787 fix: implementation for #73
All checks were successful
Sanity Checks / sanity-test (pull_request) Successful in 7s
Smoke Test / smoke (pull_request) Successful in 13s
2026-04-14 21:14:18 -04:00
3 changed files with 88 additions and 122 deletions

View File

@@ -475,6 +475,26 @@ html, body {
margin-bottom: 24px;
}
.modal-status {
min-height: 22px;
margin: 0 0 16px;
font-size: 0.9rem;
line-height: 1.45;
color: #8b949e;
}
.modal-status.is-visible {
display: block;
}
.modal-status.success {
color: #3fb950;
}
.modal-status.error {
color: #ff7b72;
}
.form-group {
margin-bottom: 16px;
}
@@ -531,36 +551,6 @@ html, body {
.btn-secondary:hover { color: #e6edf3; border-color: #8b949e; }
/* Toast notification (replaces blocking alert()) */
.toast-notification {
position: fixed;
bottom: 24px;
left: 50%;
transform: translateX(-50%) translateY(100px);
padding: 12px 24px;
border-radius: 8px;
font-size: 0.9rem;
font-weight: 500;
z-index: 10001;
opacity: 0;
transition: transform 0.3s ease, opacity 0.3s ease;
pointer-events: none;
max-width: 90vw;
text-align: center;
}
.toast-notification.visible {
transform: translateX(-50%) translateY(0);
opacity: 1;
}
.toast-notification.success {
background: #238636;
color: #fff;
}
.toast-notification.error {
background: #da3633;
color: #fff;
}
/* ===== FOOTER ===== */
#footer {
flex-shrink: 0;
@@ -767,6 +757,7 @@ html, body {
<textarea id="sp-environment" placeholder="e.g., Giving my car keys to a friend, locking away meds..."></textarea>
</div>
</div>
<div id="safety-plan-status" class="modal-status" role="status" aria-live="polite" aria-atomic="true"></div>
<div class="modal-footer">
<button class="btn btn-secondary" id="cancel-safety-plan">Cancel</button>
<button class="btn btn-primary" id="save-safety-plan">Save Plan</button>
@@ -774,9 +765,6 @@ html, body {
</div>
</div>
<!-- Toast notification (accessible, non-blocking feedback) -->
<div id="toast-notification" class="toast-notification" role="status" aria-live="polite" aria-atomic="true"></div>
<script>
(function() {
'use strict';
@@ -851,6 +839,7 @@ Sovereignty and service always.`;
var closeSafetyPlan = document.getElementById('close-safety-plan');
var cancelSafetyPlan = document.getElementById('cancel-safety-plan');
var saveSafetyPlan = document.getElementById('save-safety-plan');
var safetyPlanStatus = document.getElementById('safety-plan-status');
var clearChatBtn = document.getElementById('clear-chat-btn');
// ===== STATE =====
@@ -1216,30 +1205,24 @@ Sovereignty and service always.`;
} catch (e) {}
}
function setSafetyPlanStatus(message, type) {
safetyPlanStatus.textContent = message;
safetyPlanStatus.className = 'modal-status is-visible ' + (type || '');
}
// ===== TOAST NOTIFICATION (replaces blocking alert()) =====
var _toastEl = document.getElementById('toast-notification');
var _toastTimer = null;
function showToast(message, type) {
type = type || 'success';
_toastEl.textContent = message;
_toastEl.className = 'toast-notification ' + type;
// Force reflow before adding visible class
void _toastEl.offsetHeight;
_toastEl.classList.add('visible');
if (_toastTimer) clearTimeout(_toastTimer);
_toastTimer = setTimeout(function() {
_toastEl.classList.remove('visible');
}, 3000);
function clearSafetyPlanStatus() {
safetyPlanStatus.textContent = '';
safetyPlanStatus.className = 'modal-status';
}
closeSafetyPlan.addEventListener('click', function() {
clearSafetyPlanStatus();
safetyPlanModal.classList.remove('active');
_restoreSafetyPlanFocus();
});
cancelSafetyPlan.addEventListener('click', function() {
clearSafetyPlanStatus();
safetyPlanModal.classList.remove('active');
_restoreSafetyPlanFocus();
});
@@ -1254,11 +1237,9 @@ Sovereignty and service always.`;
};
try {
localStorage.setItem('timmy_safety_plan', JSON.stringify(plan));
safetyPlanModal.classList.remove('active');
_restoreSafetyPlanFocus();
showToast('Safety plan saved.', 'success');
setSafetyPlanStatus('Safety plan saved locally.', 'success');
} catch (e) {
showToast('Error saving plan. Please try again.', 'error');
setSafetyPlanStatus('Error saving plan.', 'error');
}
});
@@ -1336,6 +1317,7 @@ Sovereignty and service always.`;
// Wire open buttons to activate focus trap
safetyPlanBtn.addEventListener('click', function() {
clearSafetyPlanStatus();
loadSafetyPlan();
safetyPlanModal.classList.add('active');
_activateSafetyPlanFocusTrap(safetyPlanBtn);
@@ -1344,6 +1326,8 @@ Sovereignty and service always.`;
// Crisis panel safety plan button (if crisis panel is visible)
if (crisisSafetyPlanBtn) {
crisisSafetyPlanBtn.addEventListener('click', function() {
clearSafetyPlanStatus();
clearSafetyPlanStatus();
loadSafetyPlan();
safetyPlanModal.classList.add('active');
_activateSafetyPlanFocusTrap(crisisSafetyPlanBtn);

View File

@@ -0,0 +1,52 @@
import pathlib
import re
import unittest
ROOT = pathlib.Path(__file__).resolve().parents[1]
INDEX_HTML = ROOT / 'index.html'
class TestSafetyPlanSaveFeedback(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.html = INDEX_HTML.read_text()
def test_modal_has_inline_status_live_region(self):
self.assertRegex(
self.html,
r'<div[^>]+id="safety-plan-status"[^>]+role="status"[^>]+aria-live="polite"[^>]*>',
'Expected an inline polite live region for safety plan save feedback.',
)
def test_save_feedback_does_not_use_blocking_alerts(self):
self.assertNotIn(
"alert('Safety plan saved locally.')",
self.html,
'Expected success feedback to stop using blocking alert().',
)
self.assertNotIn(
"alert('Error saving plan.')",
self.html,
'Expected error feedback to stop using blocking alert().',
)
def test_save_logic_updates_inline_status_for_success_and_error(self):
self.assertRegex(
self.html,
r'function\s+setSafetyPlanStatus\s*\(',
'Expected a helper to update inline save feedback.',
)
self.assertRegex(
self.html,
r"setSafetyPlanStatus\('Safety plan saved locally\.'\s*,\s*'success'\)",
'Expected success path to update inline status.',
)
self.assertRegex(
self.html,
r"setSafetyPlanStatus\('Error saving plan\.'\s*,\s*'error'\)",
'Expected error path to update inline status.',
)
if __name__ == '__main__':
unittest.main()

View File

@@ -1,70 +0,0 @@
import pathlib
import re
import unittest
ROOT = pathlib.Path(__file__).resolve().parents[1]
INDEX_HTML = ROOT / 'index.html'
class TestSafetyPlanToast(unittest.TestCase):
"""Verify safety plan save feedback uses non-blocking toast instead of alert()."""
@classmethod
def setUpClass(cls):
cls.html = INDEX_HTML.read_text()
def test_no_alert_calls_in_safety_plan_save(self):
"""Safety plan save should not use blocking alert() dialogs."""
# Find the save handler section
save_section = re.search(
r'saveSafetyPlan\.addEventListener.*?\}\);',
self.html, re.DOTALL
)
self.assertIsNotNone(save_section, 'Expected safety plan save handler to exist.')
section = save_section.group(0)
# Should not contain alert( calls
self.assertNotIn('alert(', section,
'Safety plan save handler should not use alert() — use showToast() instead.')
def test_toast_notification_element_exists(self):
"""Toast notification element should exist in the DOM."""
self.assertIn('id="toast-notification"', self.html,
'Expected toast-notification element in HTML.')
def test_toast_has_accessibility_attributes(self):
"""Toast should have aria-live for screen reader announcements."""
self.assertIn('aria-live="polite"', self.html,
'Toast should have aria-live="polite" for accessibility.')
self.assertIn('aria-atomic="true"', self.html,
'Toast should have aria-atomic="true" for complete announcement.')
def test_toast_css_exists(self):
"""Toast CSS styles should be defined."""
self.assertIn('.toast-notification', self.html,
'Expected .toast-notification CSS class.')
self.assertIn('.toast-notification.visible', self.html,
'Expected .toast-notification.visible CSS class.')
self.assertIn('.toast-notification.success', self.html,
'Expected .toast-notification.success CSS class.')
self.assertIn('.toast-notification.error', self.html,
'Expected .toast-notification.error CSS class.')
def test_showToast_function_exists(self):
"""showToast function should be defined."""
self.assertRegex(self.html, r'function\s+showToast\s*\(',
'Expected showToast function to be defined.')
def test_success_message_uses_toast(self):
"""Success feedback should use showToast with success type."""
self.assertIn("showToast('Safety plan saved.", self.html,
'Expected success message to use showToast.')
def test_error_message_uses_toast(self):
"""Error feedback should use showToast with error type."""
self.assertIn("showToast('Error saving plan.", self.html,
'Expected error message to use showToast.')
def test_toast_auto_dismisses(self):
"""Toast should auto-dismiss after timeout."""
self.assertRegex(self.html, r'setTimeout\s*\(\s*function',
'Expected setTimeout for toast auto-dismiss.')