@zq-silk/yui 2.17.0 → 2.18.0

package/dist/web/assets/client/layout/manageShell.js

@@ -16,22 +16,30 @@ export function manageArea(page, section) {
 export function pageSections(page) {
   return Object.values(SECTIONS).flat().filter(item => item.page === page).map(item => item.section);
 }
+const TASK_ID = /^task-\d+$/;
 export function readManageRoute(url) {
   const parts = url.pathname.split("/").filter(Boolean);
+  // Jobs has its own entry. The retired Settings section keeps its links
+  // working: it opens the same Job (canonicalized without a Back step).
+  const legacyJobs = parts[0] === "settings" && (parts[1] || url.searchParams.get("section")) === "jobs";
+  if (parts[0] === "jobs" || legacyJobs) {
+    const task = url.searchParams.get("task");
+    return { page: "jobs", section: "jobs", task: task && TASK_ID.test(task) ? task : null,
+      job: url.searchParams.get("job"), jobRun: url.searchParams.get("jobRun"),
+      artifact: url.searchParams.get("artifact"), ...(legacyJobs ? { moved: true } : {}) };
+  }
   const area = parts[0] === "settings" ? "settings" : "models";
   const requested = parts[1] || url.searchParams.get("section");
   const section = (SECTIONS[area].find(item => item.section === requested) ||
     (area === "models" && requested === "connection" ? SECTIONS.settings.at(-1) : SECTIONS[area][0])).section;
   return { page: section === "connection" ? "models" : area, section,
-    ...(section === "jobs" ? { job: url.searchParams.get("job"), jobRun: url.searchParams.get("jobRun"),
-      artifact: url.searchParams.get("artifact") } : {}),
     source: url.searchParams.get("source") === "command-code" ? "command-code" : "factory" };
 }
 export function manageHref(next) {
-  if (next.section === "jobs") {
+  if (next.page === "jobs") {
     const query = new URLSearchParams();
-    for (const key of ["job", "jobRun", "artifact"]) if (next[key]) query.set(key, next[key]);
-    return "/settings/jobs" + (query.size ? "?" + query : "");
+    for (const key of ["task", "job", "jobRun", "artifact"]) if (next[key]) query.set(key, next[key]);
+    return "/jobs" + (query.size ? "?" + query : "");
   }
   return "/" + manageArea(next.page, next.section) + "/" + next.section +
     (next.section === "quota" && next.source === "command-code" ? "?source=command-code" : "");
@@ -53,11 +61,15 @@ function render() {
     if (link.dataset.area === area) link.setAttribute("aria-current", "page"); else link.removeAttribute("aria-current");
   });
   // The list head and the top bar name where the reader is.
-  const areaTitle = i18n.t(area + ".title");
-  const sectionTitle = i18n.t((route.page === "models" ? "models" : "settings") + ".section." + route.section);
+  const areaTitle = i18n.t(area === "jobs" ? "nav.jobs" : area + ".title");
+  const page = pages.get(route.page);
+  const sectionTitle = page && page.crumb ? page.crumb()
+    : i18n.t((route.page === "models" ? "models" : "settings") + ".section." + route.section);
   document.querySelector("#manage-area-title").textContent = areaTitle;
   document.querySelector("#manage-crumb-area").textContent = areaTitle;
   document.querySelector("#manage-crumb-section").textContent = sectionTitle;
+  // Area-only controls in the shared list head (the Jobs sync and refresh).
+  rail.querySelectorAll("[data-area-only]").forEach(node => { node.hidden = node.dataset.areaOnly !== area; });
   rail.querySelectorAll("[data-area-group]").forEach(group => {
     if (group.dataset.areaGroup === area) group.dataset.active = "true"; else delete group.dataset.active;
   });
@@ -65,27 +77,60 @@ function render() {
   document.title = sectionTitle + " · " + areaTitle + " · Yui";
 }
 function apply(next) {
+  // The page being left is told first, so it can set aside what must not
+  // outlive its visibility (a modal editor) without discarding it.
+  const previous = route && route.page !== next.page ? pages.get(route.page) : null;
+  if (previous && previous.hide) previous.hide();
   route = next;
   rememberPlace(manageArea(next.page, next.section), manageHref(next));
   rememberPlace("manage", manageHref(next));
-  document.querySelector("#models-root").hidden = next.page !== "models";
-  document.querySelector("#settings-root").hidden = next.page !== "settings";
+  for (const name of ["models", "settings", "jobs"]) document.querySelector("#" + name + "-root").hidden = next.page !== name;
   pages.get(next.page).show(next);
   render();
 }
 // A section the reader switched to rises in (never on the first paint).
 function revealSection() {
   if (typeof enter !== "function") return;
-  enter(document.querySelector("#models-root:not([hidden]), #settings-root:not([hidden])"), "rise");
+  enter(document.querySelector("#models-root:not([hidden]), #settings-root:not([hidden]), #jobs-root:not([hidden])"), "rise");
+}
+// Every route change (link, control, Back/Forward) first asks the page it
+// leaves and the page it enters; either may keep the current view.
+function mayNavigate(next) {
+  for (const name of new Set([route.page, next.page])) {
+    const page = pages.get(name);
+    if (page && page.canNavigate && !page.canNavigate(next)) return false;
+  }
+  return true;
 }
+// Returns false when a page kept the current view (nothing changed).
 export function navigateManage(next) {
   const normalized = readManageRoute(new URL(manageHref(next), location.origin));
-  if (manageHref(normalized) === location.pathname + location.search) return;
+  if (manageHref(normalized) === location.pathname + location.search) return true;
+  if (!mayNavigate(normalized)) return false;
   history.replaceState({ ...history.state, scroll: scroller().scrollTop }, "");
   history.pushState({ scroll: 0 }, "", manageHref(normalized));
   apply(normalized);
   scroller().scrollTop = 0;
   revealSection();
+  return true;
+}
+// A page settled on a more exact address for the current view (for example
+// the Job it opened): record it in place, without a history step.
+export function replaceManageRoute(next) {
+  route = next;
+  rememberPlace(manageArea(next.page, next.section), manageHref(next));
+  rememberPlace("manage", manageHref(next));
+  history.replaceState(history.state, "", manageHref(next));
+  render();
+}
+// A page already shows a selection the reader chose in place (for example a
+// Run opened under its row): record it as a history step without applying it
+// again, keeping the reading position for Back.
+export function pushManageRoute(next) {
+  if (manageHref(next) === location.pathname + location.search) return;
+  history.replaceState({ ...history.state, scroll: scroller().scrollTop }, "");
+  history.pushState({ scroll: scroller().scrollTop }, "", manageHref(next));
+  replaceManageRoute(next);
 }
 export function createManageShell(options) {
   return {
@@ -108,14 +153,15 @@ export function startManagement() {
     if (!link || link.target || link.hasAttribute("download") || event.defaultPrevented ||
       event.button > 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;
     const url = new URL(link.href);
-    // Exact Job/Run links initialize a new pinned view, not just a section switch.
-    if (url.searchParams.has("job")) return;
-    if (url.origin !== location.origin || !/^\/(models|settings)(\/|$)/.test(url.pathname)) return;
+    if (url.origin !== location.origin || !/^\/(models|settings|jobs)(\/|$)/.test(url.pathname)) return;
     event.preventDefault();
     navigateManage(readManageRoute(url));
   });
   window.addEventListener("popstate", () => {
-    apply(readManageRoute(new URL(location.href)));
+    const next = readManageRoute(new URL(location.href));
+    // A kept view restores its own address as the newest entry.
+    if (!mayNavigate(next)) { history.pushState({ scroll: scroller().scrollTop }, "", manageHref(route)); return; }
+    apply(next);
     scroller().scrollTop = history.state?.scroll || 0;
     revealSection();
   });

package/dist/web/assets/client/layout/router.js

@@ -23,7 +23,8 @@ export function syncUrl(state, replace) {
   if (state.query) params.set("q", state.query); else params.delete("q");
   if (state.attentionFilter) params.set("attention", state.attentionFilter); else params.delete("attention");
   if (state.catalogAll) params.set("all", "true"); else params.delete("all");
-  if (state.source && state.source !== "ordinary") params.set("source", state.source); else params.delete("source");
+  // Tasks have no category filter: every real Task, Job-created ones marked.
+  params.delete("source");
   applyUrl(params, replace);
 }
 

package/dist/web/assets/client/lib/prefs.js

@@ -18,7 +18,7 @@ export function clearPreference(key) {
 // switching back restores the filters, Task or section the user left. Only
 // same-origin paths of the expected area are accepted; anything else falls back.
 const PLACES = { workbench: /^\/(?:\?|$)/, models: /^\/models(?:[/?]|$)/, settings: /^\/settings(?:[/?]|$)/,
-  manage: /^\/(?:models|settings)(?:[/?]|$)/ };
+  jobs: /^\/jobs(?:[/?]|$)/, manage: /^\/(?:jobs|models|settings)(?:[/?]|$)/ };
 
 export function rememberPlace(area, href) {
   if (!PLACES[area] || !PLACES[area].test(href)) return;