Merge branch 'r2-web'
# Conflicts: # app/static/roles.js # app/web/api.py # tests/test_web.py
This commit is contained in:
commit
a629eda8de
13 files changed
+548
-203
No files matched your search
+92
-42
@@ -47,7 +47,7 @@
|
||||
(function () {
|
||||
"use strict";
|
||||
|
||||
const { api, esc, debounce, companies, loadCompanies, affinityControl, judgeButtons,
|
||||
const { api, esc, debounce, safeUrl, companies, loadCompanies, affinityControl, judgeButtons,
|
||||
loadTracked } = window;
|
||||
const $ = (sel, root = document) => root.querySelector(sel);
|
||||
|
||||
@@ -107,10 +107,9 @@
|
||||
pushedReader: false, // we own a history entry, so closing is `history.back()`
|
||||
summarising: null, // the uid whose summary is being waited for
|
||||
listY: 0, // where the page was scrolled when the reader replaced the feed
|
||||
feedError: false, // the feed's own fetch failed; the empty state offers a retry
|
||||
};
|
||||
|
||||
const safeUrl = (u) => (/^https?:\/\//i.test(u || "") ? u : "");
|
||||
|
||||
function ago(iso) {
|
||||
const mins = (Date.now() - new Date(iso)) / 60000;
|
||||
if (!Number.isFinite(mins)) return "";
|
||||
@@ -202,11 +201,20 @@
|
||||
try {
|
||||
data = await api(`/api/roles?${params}`);
|
||||
} catch (err) {
|
||||
// An append failure leaves what is already on screen; a first load or
|
||||
// a reload has nothing to show, so the empty state offers a retry
|
||||
// rather than leaving the feed blank for good.
|
||||
if (!append && request === feedRequest) {
|
||||
state.feedError = true;
|
||||
state.loaded = false;
|
||||
renderFeed();
|
||||
}
|
||||
return;
|
||||
} finally {
|
||||
if (request === feedRequest) state.loading = false;
|
||||
}
|
||||
if (request !== feedRequest) return;
|
||||
state.feedError = false;
|
||||
|
||||
const held = append ? state.items[state.selected]?.uid : state.readingUid;
|
||||
state.total = data.total;
|
||||
@@ -475,15 +483,23 @@
|
||||
for (const el of had.values()) el.remove();
|
||||
}
|
||||
|
||||
/* The summary when there is one, else the description's opening, cut at a
|
||||
word. */
|
||||
/* Built on the server (`app.models.excerpt`) and served as `role.excerpt`,
|
||||
so the list response never carries the full description a row would
|
||||
otherwise need to cut this from — see docs/decisions.md, "The pages". */
|
||||
function excerpt(role) {
|
||||
if (role.summary) return role.summary;
|
||||
const text = (role.description || "").replace(/\s+/g, " ").trim();
|
||||
if (text.length <= 160) return text;
|
||||
const cut = text.slice(0, 160);
|
||||
return role.excerpt || "";
|
||||
}
|
||||
|
||||
/* The same cut, run here instead: for the one row `merge` refreshes after
|
||||
a fetch or a summarise, off the full role that call answers with, which
|
||||
is the only time this page ever sees a role's `summary` or
|
||||
`description` directly. */
|
||||
function excerptOf(role) {
|
||||
const text = (role.summary || role.description || "").replace(/\s+/g, " ").trim();
|
||||
if (text.length <= 200) return text;
|
||||
const cut = text.slice(0, 200);
|
||||
const space = cut.lastIndexOf(" ");
|
||||
return `${(space > 100 ? cut.slice(0, space) : cut).replace(/[\s,.;:–-]+$/, "")}…`;
|
||||
return `${(space > 120 ? cut.slice(0, space) : cut).replace(/[\s,.;:–-]+$/, "")}…`;
|
||||
}
|
||||
|
||||
function tagChips(tags) {
|
||||
@@ -584,21 +600,29 @@
|
||||
sync($("#roles-list"), state.items.map((role, i) => [role.uid, { role, i }]), makeRow, fillRow);
|
||||
|
||||
const empty = $("#feed-empty");
|
||||
empty.hidden = !(state.loaded && !state.items.length);
|
||||
empty.hidden = !((state.loaded || state.feedError) && !state.items.length);
|
||||
if (!empty.hidden) {
|
||||
const f = state.filter;
|
||||
const filtered = state.q || f.tags.size || f.period !== "all" || !f.showRead
|
||||
|| f.company.trim() || f.place.trim() || f.function || f.remote || f.pay || f.judged;
|
||||
empty.innerHTML = filtered
|
||||
? `<h2>Nothing matches</h2>
|
||||
<p>No open role fits these filters.
|
||||
<button type="button" class="linky" data-clear>Clear them</button> and start again.</p>`
|
||||
: `<h2>No roles yet</h2>
|
||||
<p>Nothing has been pulled yet. <a href="/settings/sources#runs">Runs</a> starts one;
|
||||
<a href="/settings/sources#job-boards">Job boards</a> and
|
||||
<a href="/settings/sources#company-boards">Company boards</a> decide what it brings in.</p>`;
|
||||
const clear = empty.querySelector("[data-clear]");
|
||||
if (clear) clear.onclick = () => { state.q = ""; $("#search").value = ""; clearFilters(); };
|
||||
if (state.feedError) {
|
||||
empty.innerHTML = `<h2>Could not load the feed</h2>
|
||||
<p>The server did not answer. <button type="button" class="linky" data-retry
|
||||
>Try again</button>.</p>`;
|
||||
const retry = empty.querySelector("[data-retry]");
|
||||
if (retry) retry.onclick = () => loadFeed();
|
||||
} else {
|
||||
const f = state.filter;
|
||||
const filtered = state.q || f.tags.size || f.period !== "all" || !f.showRead
|
||||
|| f.company.trim() || f.place.trim() || f.function || f.remote || f.pay || f.judged;
|
||||
empty.innerHTML = filtered
|
||||
? `<h2>Nothing matches</h2>
|
||||
<p>No open role fits these filters.
|
||||
<button type="button" class="linky" data-clear>Clear them</button> and start again.</p>`
|
||||
: `<h2>No roles yet</h2>
|
||||
<p>Nothing has been pulled yet. <a href="/settings/sources#runs">Runs</a> starts one;
|
||||
<a href="/settings/sources#job-boards">Job boards</a> and
|
||||
<a href="/settings/sources#company-boards">Company boards</a> decide what it brings in.</p>`;
|
||||
const clear = empty.querySelector("[data-clear]");
|
||||
if (clear) clear.onclick = () => { state.q = ""; $("#search").value = ""; clearFilters(); };
|
||||
}
|
||||
}
|
||||
|
||||
// The end of the list says which end it is: a list that has run out and
|
||||
@@ -755,9 +779,13 @@
|
||||
}
|
||||
if (!open) { el.replaceChildren(); return; }
|
||||
|
||||
// The list row is already in memory, and a list row is the whole role, so
|
||||
// the pane paints from it at once and the fetch only brings it up to date.
|
||||
// The list row is already in memory, and carries what a row draws —
|
||||
// title, company, place, tags, pay — so the pane paints those at once;
|
||||
// the body, the summary state and the original link wait on the fetch
|
||||
// (`loaded`), since the list row no longer carries them (see
|
||||
// `Store.roles_page`).
|
||||
const stub = state.items.find((r) => r.uid === state.readingUid);
|
||||
const loaded = Boolean(state.reading) && state.reading.uid === state.readingUid;
|
||||
const r = state.reading || stub || {};
|
||||
const same = el.dataset.uid === state.readingUid;
|
||||
const scrolled = same ? el.querySelector(".reader-body")?.scrollTop || 0 : 0;
|
||||
@@ -768,13 +796,13 @@
|
||||
const text = (r.article_text || r.description || "").trim();
|
||||
const body = error
|
||||
? `<p class="reader-note">This role could not be loaded: ${esc(error)}</p>`
|
||||
: !r.uid
|
||||
: !loaded
|
||||
? `<p class="reader-note">Loading…</p>`
|
||||
: text ? paragraphs(text)
|
||||
: `<p class="reader-note">The board gave no description for this one.</p>`;
|
||||
const pay = payDisplay(r);
|
||||
const waiting = state.summarising === state.readingUid;
|
||||
const teaser = r.uid && !r.article_text && out && (r.description || "").length < TEASER;
|
||||
const teaser = loaded && !r.article_text && out && (r.description || "").length < TEASER;
|
||||
|
||||
el.innerHTML = `
|
||||
<div class="reader-bar">
|
||||
@@ -801,7 +829,7 @@
|
||||
${r.summary ? `<section class="reader-summary">
|
||||
<h2 class="reader-label">Summary</h2><p>${esc(r.summary)}</p></section>` : ""}
|
||||
<div class="reader-tools">
|
||||
${r.uid && !r.summary && !waiting
|
||||
${loaded && !r.summary && !waiting
|
||||
? `<button type="button" class="secondary" data-tool="summarise">Summarise</button>` : ""}
|
||||
${teaser ? `<button type="button" class="secondary" data-tool="fetch">Fetch the posting</button>` : ""}
|
||||
<span class="muted small" role="status">${waiting
|
||||
@@ -855,9 +883,9 @@
|
||||
else state.reading = updated;
|
||||
const item = state.items.find((x) => x.uid === updated.uid);
|
||||
if (item) {
|
||||
Object.assign(item, { summary: updated.summary, article_text: updated.article_text });
|
||||
item.excerpt = excerptOf(updated);
|
||||
const row = $(`#roles-list .row[data-uid="${CSS.escape(updated.uid)}"]`);
|
||||
if (row) row.role = null; // drawn again from the new text
|
||||
if (row) row.role = null; // drawn again from the new excerpt
|
||||
renderFeed();
|
||||
}
|
||||
renderReader();
|
||||
@@ -1116,19 +1144,41 @@
|
||||
wire();
|
||||
renderRail();
|
||||
renderActive();
|
||||
// The agent first: the companies, the feed and the counts are its.
|
||||
try {
|
||||
await Promise.all([loadTracked(), loadAgents()]);
|
||||
chooseAgent();
|
||||
await loadCompanies(state.filter.agent);
|
||||
} catch (err) {
|
||||
return;
|
||||
}
|
||||
renderRail();
|
||||
renderActive();
|
||||
loadFilters().catch(() => {});
|
||||
|
||||
// The feed is the page; agents and companies are enhancements that fill
|
||||
// in when they arrive, not something it waits on — a slow or failed
|
||||
// /api/agents or /api/companies must not leave it blank. Each one drawn
|
||||
// here is greyed or missing until `enhance` lands, which is what "no
|
||||
// agent" (renderAgent), an unjoined company (paintRow) and the tag row
|
||||
// being empty already mean, so nothing here is a new state to handle.
|
||||
const before = state.filter.agent;
|
||||
const enhance = (async () => {
|
||||
try {
|
||||
await Promise.all([loadTracked(), loadAgents()]);
|
||||
chooseAgent();
|
||||
await loadCompanies(state.filter.agent);
|
||||
} catch (err) {
|
||||
return;
|
||||
}
|
||||
renderRail();
|
||||
renderActive();
|
||||
loadFilters().catch(() => {});
|
||||
// The feed's first request went out with whatever agent `readUrl` had
|
||||
// (often none): reload for the score and votes once the real one is
|
||||
// known, and either way bring the reader's affinity control and judge
|
||||
// buttons up to date, since `companies` was still empty when it first
|
||||
// painted.
|
||||
if (state.filter.agent !== before) reload();
|
||||
else renderFeed();
|
||||
if (state.readingUid) {
|
||||
if (state.filter.agent !== before) refreshReader(state.readingUid);
|
||||
else renderReader();
|
||||
}
|
||||
})();
|
||||
|
||||
route();
|
||||
await loadFeed({ keep: was ? was.count : 0 });
|
||||
if (was && !state.readingUid) window.scrollTo(0, was.y || 0);
|
||||
await enhance;
|
||||
});
|
||||
})();
|
||||
Reference in new issue
Block a user