Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove jQuery from the webhook editor #29211

Merged
merged 4 commits into from
Feb 17, 2024
Merged

Remove jQuery from the webhook editor #29211

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c6f0ce
Remove jQuery from the webhook editor
yardenshoham Feb 17, 2024
d2d949d
Reuse logic
yardenshoham Feb 17, 2024
53a6c5e
Merge branch 'main' into webhook-editor-jquery
yardenshoham Feb 17, 2024
a331d5b
Merge branch 'main' into webhook-editor-jquery
GiteaBot Feb 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 27 additions & 29 deletions web_src/js/features/comp/WebHookEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,41 @@
import $ from 'jquery';
import {POST} from '../../modules/fetch.js';
import {hideElem, showElem, toggleElem} from '../../utils/dom.js';

const {csrfToken} = window.config;

export function initCompWebHookEditor() {
if ($('.new.webhook').length === 0) {
if (!document.querySelectorAll('.new.webhook').length) {
return;
}

$('.events.checkbox input').on('change', function () {
if ($(this).is(':checked')) {
showElem($('.events.fields'));
}
});
$('.non-events.checkbox input').on('change', function () {
if ($(this).is(':checked')) {
hideElem($('.events.fields'));
}
});
for (const input of document.querySelectorAll('.events.checkbox input')) {
input.addEventListener('change', function () {
if (this.checked) {
showElem(document.querySelector('.events.fields'));
}
6543 marked this conversation as resolved.
Show resolved Hide resolved
});
}

for (const input of document.querySelectorAll('.non-events.checkbox input')) {
input.addEventListener('change', function () {
if (this.checked) {
hideElem(document.querySelector('.events.fields'));
}
});
}

const updateContentType = function () {
const visible = $('#http_method').val() === 'POST';
toggleElem($('#content_type').parent().parent(), visible);
const visible = document.getElementById('http_method').value === 'POST';
toggleElem(document.getElementById('content_type').parentNode.parentNode, visible);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regression:

WebHookEditor.js:26 Uncaught TypeError: Cannot read properties of null (reading 'value')
    at updateContentType (WebHookEditor.js:26:58)
    at initCompWebHookEditor (WebHookEditor.js:29:3)
    at HTMLDocument.<anonymous> (index.js:109:24)

  const updateContentType = function () {
    const visible = document.getElementById('http_method').value === 'POST';  // <--------- HERE
    toggleElem(document.getElementById('content_type').parentNode.parentNode, visible);
  };

http_method may not exist.

};
updateContentType();
$('#http_method').on('change', () => {
updateContentType();
});

document.getElementById('http_method').addEventListener('change', updateContentType);

// Test delivery
$('#test-delivery').on('click', function () {
const $this = $(this);
$this.addClass('loading disabled');
$.post($this.data('link'), {
_csrf: csrfToken
}).done(
setTimeout(() => {
window.location.href = $this.data('redirect');
}, 5000)
);
document.getElementById('test-delivery')?.addEventListener('click', async function () {
this.classList.add('loading', 'disabled');
await POST(this.getAttribute('data-link'));
setTimeout(() => {
window.location.href = this.getAttribute('data-redirect');
}, 5000);
});
}
Loading