diff --git a/app/static/admin.css b/app/static/admin.css index b92cde9..8cd68ee 100644 --- a/app/static/admin.css +++ b/app/static/admin.css @@ -728,6 +728,29 @@ border-radius: 8px; } +.directory__results { + position: relative; + min-width: 0; +} + +.directory__loading:not([hidden]) { + position: absolute; + inset: 0; + z-index: 3; + display: grid; + place-items: start center; + padding: 32px 16px; + color: #1f2937; + background: rgb(255 255 255 / 92%); + border-radius: 8px; + font-weight: 700; +} + +.directory--loading :is(input:disabled, select:disabled, button:disabled, a[inert], summary[inert], .directory__direction input:disabled + span) { + cursor: wait; + opacity: 0.6; +} + .directory__pagination { display: flex; align-items: center; diff --git a/app/static/admin.js b/app/static/admin.js index 8e7f61c..42636bb 100644 --- a/app/static/admin.js +++ b/app/static/admin.js @@ -86,6 +86,8 @@ const exportLink = document.querySelector("[data-directory-export]"); const results = document.querySelector("[data-directory-results]"); const pagination = document.querySelector("[data-directory-pagination]"); + const directory = form.closest(".directory"); + const overlay = directory.querySelector("[data-directory-loading]"); const fields = ["q", "pps", "sort", "direction", "limit"]; const readControls = () => { const data = new FormData(form); @@ -95,6 +97,28 @@ let appliedSummary = summary.textContent; let timer; let pending; + let lockedControls = []; + let lockedLinks = []; + + function setLoading(loading, blocking = false) { + lockedControls.forEach((control) => { control.disabled = false; }); + lockedLinks.forEach((link) => { link.inert = false; }); + lockedControls = []; + lockedLinks = []; + overlay.hidden = !loading || !blocking; + results.toggleAttribute("inert", loading && blocking); + results.setAttribute("aria-busy", String(loading)); + directory.classList.toggle("directory--loading", loading && blocking); + if (loading) { + summary.textContent = blocking ? "Обновляем список…" : "Идёт поиск…"; + } + if (loading && blocking) { + lockedControls = Array.from(directory.querySelectorAll("input:not(:disabled), select:not(:disabled), button:not(:disabled)")); + lockedLinks = Array.from(directory.querySelectorAll("a:not([inert]), summary:not([inert])")); + lockedControls.forEach((control) => { control.disabled = true; }); + lockedLinks.forEach((link) => { link.inert = true; }); + } + } form.querySelector(".directory__filter-panel").addEventListener("invalid", (event) => { event.currentTarget.open = true; @@ -105,22 +129,24 @@ else event.formData.delete("q"); }); - async function refresh() { + async function refresh(blocking = false, manual = false) { const next = readControls(); - if (next.toString() === applied.toString()) { + if (!manual && next.toString() === applied.toString()) { + setLoading(false); if (summary.textContent !== appliedSummary) summary.textContent = appliedSummary; return; } // Keep applied additional filters even if their fields have unsubmitted edits. const url = new URL(window.location.href); url.searchParams.delete("offset"); + if (manual) url.search = new URLSearchParams(new FormData(form)).toString(); for (const [name, value] of next) { if (value) url.searchParams.set(name, value); else url.searchParams.delete(name); } const request = new AbortController(); pending = request; - results.setAttribute("aria-busy", "true"); + setLoading(true, blocking); try { const response = await fetch(url, { signal: AbortSignal.any([request.signal, AbortSignal.timeout(15000)]), @@ -141,25 +167,40 @@ appliedSummary = nextSummary.textContent; summary.textContent = appliedSummary; applied = next; + if (manual) { + const panel = form.querySelector(".directory__filter-panel"); + panel.querySelector("summary").textContent = page.querySelector(".directory__filter-panel > summary").textContent; + panel.open = false; + } } catch (_error) { if (!request.signal.aborted) { summary.textContent = "Не удалось обновить список. Показаны предыдущие результаты."; } } finally { if (pending === request) { - results.removeAttribute("aria-busy"); + setLoading(false); pending = null; } } } - function schedule(delay = 0) { + function schedule(delay = 0, blocking = false, manual = false) { clearTimeout(timer); pending?.abort(); - if (delay) timer = setTimeout(refresh, delay); - else refresh(); + pending = null; + setLoading(false); + if (delay) { + if (readControls().toString() !== applied.toString()) setLoading(true); + else summary.textContent = appliedSummary; + timer = setTimeout(() => refresh(), delay); + } else refresh(blocking, manual); } + form.addEventListener("submit", (event) => { + event.preventDefault(); + schedule(0, true, true); + }); + search.addEventListener("input", (event) => { if (!event.isComposing) schedule(250); }); @@ -171,7 +212,7 @@ } }); form.querySelector(".directory__toolbar").addEventListener("change", (event) => { - if (event.target !== search) schedule(); + if (event.target !== search) schedule(0, true); }); } diff --git a/app/templates/directory.html b/app/templates/directory.html index 867cb76..fa44ac8 100644 --- a/app/templates/directory.html +++ b/app/templates/directory.html @@ -94,6 +94,8 @@
«Год начала» — начало работы в ВШЭ. «Впервые найден» и «Последний раз найден» — даты обнаружения сотрудника в списке источника, а не даты приёма и увольнения. «Требует проверки» означает, что профиль недоступен и увольнение ещё не подтверждено.
+