fix: implementation for #73

2026-04-14 21:14:18 -04:00
3 changed files with 91 additions and 126 deletions
--- a/index.html
+++ b/index.html
@@ -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;
 }
@@ -613,31 +633,6 @@ html, body {
  top: 8px;
  outline: 2px solid #58a6ff;
 }
-
-/* ===== TOAST NOTIFICATION ===== */
-.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; }
-
 </style>
 </head>
 <body>
@@ -762,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>
@@ -769,11 +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';
@@ -848,24 +839,9 @@ 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');

-
-  // ===== TOAST NOTIFICATION =====
-  var _toastEl = document.getElementById('toast-notification');
-  var _toastTimer = null;
-
-  function showToast(message, type) {
-    type = type || 'success';
-    _toastEl.textContent = message;
-    _toastEl.className = 'toast-notification ' + type;
-    void _toastEl.offsetHeight; // force reflow before transition
-    _toastEl.classList.add('visible');
-    if (_toastTimer) clearTimeout(_toastTimer);
-    _toastTimer = setTimeout(function() {
-      _toastEl.classList.remove('visible');
-    }, 3000);
-  }
  // ===== STATE =====
  var messages = [];
  var isStreaming = false;
@@ -1229,12 +1205,24 @@ Sovereignty and service always.`;
    } catch (e) {}
  }

+  function setSafetyPlanStatus(message, type) {
+    safetyPlanStatus.textContent = message;
+    safetyPlanStatus.className = 'modal-status is-visible ' + (type || '');
+  }
+
+  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();
  });
@@ -1249,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 locally.', 'success');
+      setSafetyPlanStatus('Safety plan saved locally.', 'success');
    } catch (e) {
-      showToast('Error saving plan.', 'error');
+      setSafetyPlanStatus('Error saving plan.', 'error');
    }
  });

@@ -1331,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);
@@ -1339,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);
--- a/tests/test_safety_plan_save_feedback.py
+++ b/tests/test_safety_plan_save_feedback.py
@@ -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()
--- a/tests/test_toast_notification.py
+++ b/tests/test_toast_notification.py
@@ -1,76 +0,0 @@
-import pathlib
-import re
-import unittest
-
-ROOT = pathlib.Path(__file__).resolve().parents[1]
-INDEX_HTML = ROOT / "index.html"
-
-
-class TestToastNotification(unittest.TestCase):
-    """Regression tests for toast notification replacing blocking alert(). Issue #73."""
-
-    @classmethod
-    def setUpClass(cls):
-        cls.html = INDEX_HTML.read_text()
-
-    # -- CSS --
-    def test_toast_css_exists(self):
-        self.assertIn(".toast-notification", self.html,
-            "Expected .toast-notification CSS class.")
-
-    def test_toast_success_error_classes(self):
-        self.assertIn(".toast-notification.success", self.html,
-            "Expected .success variant for green toast.")
-        self.assertIn(".toast-notification.error", self.html,
-            "Expected .error variant for red toast.")
-
-    def test_toast_visible_transition(self):
-        self.assertIn(".toast-notification.visible", self.html,
-            "Expected .visible class to trigger slide-up transition.")
-
-    # -- HTML element --
-    def test_toast_element_exists(self):
-        self.assertIn('id="toast-notification"', self.html,
-            "Expected toast-notification element.")
-
-    def test_toast_aria_live(self):
-        self.assertRegex(self.html,
-            r'aria-live="polite"',
-            "Expected aria-live="polite" for accessible announcements.")
-
-    def test_toast_role_status(self):
-        self.assertRegex(self.html,
-            r'role="status"',
-            "Expected role="status" for toast element.")
-
-    # -- JS function --
-    def test_showToast_function_defined(self):
-        self.assertRegex(self.html,
-            r"function\s+showToast\s*\(",
-            "Expected showToast() function to be defined.")
-
-    def test_showToast_auto_dismiss(self):
-        self.assertRegex(self.html,
-            r"setTimeout.*classList\.remove\(.*visible.*\)",
-            "Expected setTimeout to auto-dismiss toast.")
-
-    # -- alert() replaced --
-    def test_no_alert_in_safety_plan_save(self):
-        lines = self.html.split("\n")
-        for i, line in enumerate(lines):
-            if "alert(" in line:
-                self.fail(
-                    f"Blocking alert() still present at line {i+1}: {line.strip()}"
-                )
-
-    def test_showToast_used_for_save_success(self):
-        self.assertIn("showToast('Safety plan saved locally.', 'success')", self.html,
-            "Expected showToast success call for save feedback.")
-
-    def test_showToast_used_for_save_error(self):
-        self.assertIn("showToast('Error saving plan.', 'error')", self.html,
-            "Expected showToast error call for save error feedback.")
-
-
-if __name__ == "__main__":
-    unittest.main()