finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor and fix archive link bug (#30535)

Browse source 
Regression of #29920
Fixes: #30569

Also this is a rewriting to eliminate the remaining jQuery usages from code.

Co-authored-by: Giteabot <teabot@gitea.io>
(cherry picked from commit d0e07083559180b124a08359fcc72f9ef695e723)

Conflicts:
	- web_src/js/features/repo-common.js
	  Conflict resolved in favour of Gitea.
This commit is contained in:
wxiaoguang 2024-04-19 00:45:50 +08:00 committed by Gergely Nagy
parent 88804dd558
commit 7dd3c01606
No known key found for this signature in database
2 changed files with 26 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
web_src/js/features/repo-common.js
View file

@ -1,45 +1,35 @@
import $ from 'jquery'; import $ from 'jquery';
import {hideElem, showElem} from '../utils/dom.js'; import {hideElem, queryElems, showElem} from '../utils/dom.js';
import {POST} from '../modules/fetch.js'; import {POST} from '../modules/fetch.js';
import {showErrorToast} from '../modules/toast.js';
import {sleep} from '../utils.js';
async function getArchive($target, url, first) { async function onDownloadArchive(e) {
const dropdownBtn = $target[0].closest('.ui.dropdown.button') ?? $target[0].closest('.ui.dropdown.btn') ?? $target[0].closest('details.download'); e.preventDefault();
// there are many places using the "archive-link", eg: the dropdown on the repo code page, the release list
const el = e.target.closest('a.archive-link[href]');
const targetLoading = el.closest('.ui.dropdown') ?? el;
targetLoading.classList.add('is-loading', 'loading-icon-2px');
try { try {
dropdownBtn.classList.add('is-loading'); for (let tryCount = 0; ;tryCount++) {
const response = await POST(url); const response = await POST(el.href);
if (response.status === 200) { if (!response.ok) throw new Error(`Invalid server response: ${response.status}`);
const data = await response.json();
if (!data) {
// XXX Shouldn't happen?
dropdownBtn.classList.remove('is-loading');
return;
}
if (!data.complete) { const data = await response.json();
// Wait for only three quarters of a second initially, in case it's if (data.complete) break;
// quickly archived. await sleep(Math.min((tryCount + 1) * 750, 2000));
setTimeout(() => {
getArchive($target, url, false);
}, first ? 750 : 2000);
} else {
// We don't need to continue checking.
dropdownBtn.classList.remove('is-loading');
window.location.href = url;
} }
} window.location.href = el.href; // the archive is ready, start real downloading
} catch { } catch (e) {
dropdownBtn.classList.remove('is-loading'); console.error(e);
showErrorToast(`Failed to download the archive: ${e}`, {duration: 2500});
} finally {
targetLoading.classList.remove('is-loading', 'loading-icon-2px');
} }
} }
export function initRepoArchiveLinks() { export function initRepoArchiveLinks() {
$('.archive-link').on('click', function (event) { queryElems('a.archive-link[href]', (el) => el.addEventListener('click', onDownloadArchive));
event.preventDefault();
const url = this.getAttribute('href');
if (!url) return;
getArchive($(event.target), url, true);
});
} }
export function initRepoCloneLink() { export function initRepoCloneLink() {

4
web_src/js/utils/dom.js
View file

@ -69,6 +69,10 @@ export function queryElemChildren(parent, selector = '*', fn) {
return applyElemsCallback(parent.querySelectorAll(`:scope > ${selector}`), fn); return applyElemsCallback(parent.querySelectorAll(`:scope > ${selector}`), fn);
} }
export function queryElems(selector, fn) {
return applyElemsCallback(document.querySelectorAll(selector), fn);
}
export function onDomReady(cb) { export function onDomReady(cb) {
if (document.readyState === 'loading') { if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', cb); document.addEventListener('DOMContentLoaded', cb);