UI - Fixing preview/diff "ignore text" highlight button (refactor, didnt work in "preview" mode) (#2455)

6 months ago · faeed78ffb
parent 5d9081ccb2
commit faeed78ffb
7 changed files with 25 additions and 30 deletions
--- a/changedetectionio/static/js/browser-steps.js
+++ b/changedetectionio/static/js/browser-steps.js
@ -1,14 +1,5 @@
 $(document).ready(function () {

-    // duplicate
-    var csrftoken = $('input[name=csrf_token]').val();
-    $.ajaxSetup({
-        beforeSend: function (xhr, settings) {
-            if (!/^(GET|HEAD|OPTIONS|TRACE)$/i.test(settings.type) && !this.crossDomain) {
-                xhr.setRequestHeader("X-CSRFToken", csrftoken)
-            }
-        }
-    })
    var browsersteps_session_id;
    var browser_interface_seconds_remaining = 0;
    var apply_buttons_disabled = false;
--- a/changedetectionio/static/js/csrf.js
+++ b/changedetectionio/static/js/csrf.js
@ -0,0 +1,10 @@
+$(document).ready(function () {
+    $.ajaxSetup({
+        beforeSend: function (xhr, settings) {
+            if (!/^(GET|HEAD|OPTIONS|TRACE)$/i.test(settings.type) && !this.crossDomain) {
+                xhr.setRequestHeader("X-CSRFToken", csrftoken)
+            }
+        }
+    })
+});
+
--- a/changedetectionio/static/js/diff-overview.js
+++ b/changedetectionio/static/js/diff-overview.js
@ -1,13 +1,4 @@
 $(document).ready(function () {
-    var csrftoken = $('input[name=csrf_token]').val();
-    $.ajaxSetup({
-        beforeSend: function (xhr, settings) {
-            if (!/^(GET|HEAD|OPTIONS|TRACE)$/i.test(settings.type) && !this.crossDomain) {
-                xhr.setRequestHeader("X-CSRFToken", csrftoken)
-            }
-        }
-    })
-
    $('.needs-localtime').each(function () {
        for (var option of this.options) {
            var dateObject = new Date(option.value * 1000);
@ -48,6 +39,12 @@ $(document).ready(function () {
      $("#highlightSnippet").remove();
    }

+    // Listen for Escape key press
+    window.addEventListener('keydown', function (e) {
+        if (e.key === 'Escape') {
+            clean();
+        }
+    }, false);

    function dragTextHandler(event) {
        console.log('mouseupped');
--- a/changedetectionio/static/js/notifications.js
+++ b/changedetectionio/static/js/notifications.js
@ -13,16 +13,6 @@ $(document).ready(function() {
  $('#send-test-notification').click(function (e) {
    e.preventDefault();

-    // this can be global
-    var csrftoken = $('input[name=csrf_token]').val();
-    $.ajaxSetup({
-        beforeSend: function(xhr, settings) {
-            if (!/^(GET|HEAD|OPTIONS|TRACE)$/i.test(settings.type) && !this.crossDomain) {
-                xhr.setRequestHeader("X-CSRFToken", csrftoken)
-            }
-        }
-    })
-
    data = {
      notification_body: $('#notification_body').val(),
      notification_format: $('#notification_format').val(),
--- a/changedetectionio/templates/base.html
+++ b/changedetectionio/templates/base.html
@ -26,7 +26,11 @@
    <meta name="msapplication-TileColor" content="#da532c">
    <meta name="msapplication-config" content="favicons/browserconfig.xml">
    <meta name="theme-color" content="#ffffff">
+    <script>
+        const csrftoken="{{ csrf_token() }}";
+    </script>
    <script src="{{url_for('static_content', group='js', filename='jquery-3.6.0.min.js')}}"></script>
+    <script src="{{url_for('static_content', group='js', filename='csrf.js')}}" defer></script>
  </head>

  <body>
--- a/changedetectionio/tests/test_ignorehighlighter.py
+++ b/changedetectionio/tests/test_ignorehighlighter.py
@ -45,7 +45,6 @@ def test_highlight_ignore(client, live_server):
    )

    res = client.get(url_for("edit_page", uuid=uuid))
-
    # should be a regex now
    assert b'/oh\ yeah\ \d+/' in res.data

@ -55,3 +54,7 @@ def test_highlight_ignore(client, live_server):
    # And it should register in the preview page
    res = client.get(url_for("preview_page", uuid=uuid))
    assert b'<div class="ignored">oh yeah 456' in res.data
+
+    # Should be in base.html
+    assert b'csrftoken' in res.data
+
--- a/requirements.txt
+++ b/requirements.txt
@ -83,4 +83,4 @@ jsonschema==4.17.3

 loguru
 # Needed for > 3.10, https://github.com/microsoft/playwright-python/issues/2096
-greenlet >= 3.0.3
+greenlet >= 3.0.3