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.

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 "find file" page #29456

Merged
merged 6 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
60 changes: 29 additions & 31 deletions web_src/js/features/repo-findfile.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import $ from 'jquery';
import {svg} from '../svg.js';
import {toggleElem} from '../utils/dom.js';
import {pathEscapeSegments} from '../utils/url.js';

const {csrf} = window.config;
import {GET} from '../modules/fetch.js';

const threshold = 50;
let files = [];
let $repoFindFileInput, $repoFindFileTableBody, $repoFindFileNoResult;
let repoFindFileInput, repoFindFileTableBody, repoFindFileNoResult;

// return the case-insensitive sub-match result as an array: [unmatched, matched, unmatched, matched, ...]
// res[even] is unmatched, res[odd] is matched, see unit tests for examples
Expand Down Expand Up @@ -74,46 +72,46 @@ export function filterRepoFilesWeighted(files, filter) {
}

function filterRepoFiles(filter) {
const treeLink = $repoFindFileInput.attr('data-url-tree-link');
$repoFindFileTableBody.empty();
const treeLink = repoFindFileInput.getAttribute('data-url-tree-link');
repoFindFileTableBody.innerHTML = '';

const filterResult = filterRepoFilesWeighted(files, filter);
const tmplRow = `<tr><td><a></a></td></tr>`;

toggleElem($repoFindFileNoResult, filterResult.length === 0);
toggleElem(repoFindFileNoResult, filterResult.length === 0);
for (const r of filterResult) {
const $row = $(tmplRow);
const $a = $row.find('a');
$a.attr('href', `${treeLink}/${pathEscapeSegments(r.matchResult.join(''))}`);
const $octiconFile = $(svg('octicon-file')).addClass('gt-mr-3');
$a.append($octiconFile);
// if the target file path is "abc/xyz", to search "bx", then the matchResult is ['a', 'b', 'c/', 'x', 'yz']
// the matchResult[odd] is matched and highlighted to red.
for (let j = 0; j < r.matchResult.length; j++) {
if (!r.matchResult[j]) continue;
const $span = $('<span>').text(r.matchResult[j]);
if (j % 2 === 1) $span.addClass('ui text red');
$a.append($span);
const row = document.createElement('tr');
const cell = document.createElement('td');
const a = document.createElement('a');
a.setAttribute('href', `${treeLink}/${pathEscapeSegments(r.matchResult.join(''))}`);
a.innerHTML = svg('octicon-file', 16, 'gt-mr-3');
row.append(cell);
cell.append(a);
for (const [index, part] of r.matchResult.entries()) {
const span = document.createElement('span');
// safely escape by using textContent
span.textContent = part;
// if the target file path is "abc/xyz", to search "bx", then the matchResult is ['a', 'b', 'c/', 'x', 'yz']
// the matchResult[odd] is matched and highlighted to red.
if (index % 2 === 1) span.classList.add('ui', 'text', 'red');
a.append(span);
}
$repoFindFileTableBody.append($row);
repoFindFileTableBody.append(row);
}
}

async function loadRepoFiles() {
files = await $.ajax({
url: $repoFindFileInput.attr('data-url-data-link'),
headers: {'X-Csrf-Token': csrf}
});
filterRepoFiles($repoFindFileInput.val());
const response = await GET(repoFindFileInput.getAttribute('data-url-data-link'));
files = await response.json();
filterRepoFiles(repoFindFileInput.value);
}

export function initFindFileInRepo() {
$repoFindFileInput = $('#repo-file-find-input');
if (!$repoFindFileInput.length) return;
repoFindFileInput = document.getElementById('repo-file-find-input');
if (!repoFindFileInput) return;

$repoFindFileTableBody = $('#repo-find-file-table tbody');
$repoFindFileNoResult = $('#repo-find-file-no-result');
$repoFindFileInput.on('input', () => filterRepoFiles($repoFindFileInput.val()));
repoFindFileTableBody = document.querySelector('#repo-find-file-table tbody');
repoFindFileNoResult = document.getElementById('repo-find-file-no-result');
repoFindFileInput.addEventListener('input', () => filterRepoFiles(repoFindFileInput.value));

loadRepoFiles();
}
32 changes: 18 additions & 14 deletions web_src/js/features/repo-home.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import $ from 'jquery';
import {stripTags} from '../utils.js';
import {hideElem, showElem} from '../utils/dom.js';
import {POST} from '../modules/fetch.js';

const {appSubUrl, csrfToken} = window.config;
const {appSubUrl} = window.config;

export function initRepoTopicBar() {
const mgrBtn = $('#manage_topic');
Expand Down Expand Up @@ -30,14 +31,15 @@ export function initRepoTopicBar() {
mgrBtn.focus();
});

saveBtn.on('click', () => {
saveBtn.on('click', async () => {
const topics = $('input[name=topics]').val();
const formData = new FormData();
formData.append('topics', topics);
try {
const response = await POST(saveBtn.attr('data-link'), {data: formData});
const data = await response.json();

$.post(saveBtn.attr('data-link'), {
_csrf: csrfToken,
topics
}, (_data, _textStatus, xhr) => {
if (xhr.responseJSON.status === 'ok') {
if (data.status === 'ok') {
viewDiv.children('.topic').remove();
if (topics.length) {
const topicArray = topics.split(',');
Expand All @@ -52,12 +54,14 @@ export function initRepoTopicBar() {
hideElem(editDiv);
showElem(viewDiv);
}
}).fail((xhr) => {
} catch (error) {
const xhr = error.response; // Assuming `error.response` contains the fetch response object
if (xhr.status === 422) {
if (xhr.responseJSON.invalidTopics.length > 0) {
topicPrompts.formatPrompt = xhr.responseJSON.message;
const responseData = await xhr.json(); // Parse JSON response
if (responseData.invalidTopics.length > 0) {
topicPrompts.formatPrompt = responseData.message;
wxiaoguang marked this conversation as resolved.
Show resolved Hide resolved

const {invalidTopics} = xhr.responseJSON;
const {invalidTopics} = responseData;
const topicLabels = topicDropdown.children('a.ui.label');

for (const [index, value] of topics.split(',').entries()) {
Expand All @@ -68,12 +72,12 @@ export function initRepoTopicBar() {
}
}
} else {
topicPrompts.countPrompt = xhr.responseJSON.message;
topicPrompts.countPrompt = responseData.message;
}
}
}).always(() => {
} finally {
topicForm.form('validate form');
});
}
});

topicDropdown.dropdown({
Expand Down
Loading