pandorga 1.4.5 → 1.4.7

data/studio/index.html

@@ -18,7 +18,7 @@
       rel="stylesheet"
       href="https://cdn.jsdelivr.net/gh/lipis/flag-icons@7.2.3/css/flag-icons.min.css"
     />
-    <script type="module" crossorigin src="/studio/assets/index-OAmrbW7i.js"></script>
+    <script type="module" crossorigin src="/studio/assets/index-BJyN-kB3.js"></script>
     <link rel="stylesheet" crossorigin href="/studio/assets/index-Cd1mlY_H.css">
   </head>
   <body>

data/studio-app/src/main.js

@@ -907,9 +907,20 @@ function pipelineChipMeta(pipelineState) {
   }
 }
 
+function pipelineChipViewKey() {
+  const meta = pipelineChipMeta(state.pipeline.state);
+  return JSON.stringify([
+    meta.className,
+    meta.spinning,
+    meta.icon,
+    meta.label,
+    meta.title,
+    state.pipeline.runUrl || "",
+  ]);
+}
+
 function renderPipelineChip() {
   const meta = pipelineChipMeta(state.pipeline.state);
-  const runUrl = state.pipeline.runUrl;
   const kids = [
     el("span", {
       className:
@@ -928,11 +939,13 @@ function renderPipelineChip() {
       "aria-label": meta.label,
       role: "status",
       "data-studio-action": "pipeline-status",
-      disabled: !runUrl,
+      "data-pipeline-key": pipelineChipViewKey(),
+      disabled: !state.pipeline.runUrl,
       onClick: () => {
-        if (!runUrl) return;
+        const url = state.pipeline.runUrl;
+        if (!url) return;
         try {
-          window.open(runUrl, "_blank", "noopener,noreferrer");
+          window.open(url, "_blank", "noopener,noreferrer");
         } catch {
           /* ignore */
         }
@@ -942,6 +955,18 @@ function renderPipelineChip() {
   );
 }
 
+/**
+ * Swap the toolbar chip only. renderShell() wipes #app and remounts the
+ * editor, so a poll tick would steal focus for the whole pipeline run.
+ */
+function syncPipelineChip() {
+  const current = document.querySelector("[data-studio-action='pipeline-status']");
+  if (!current) return;
+  const key = pipelineChipViewKey();
+  if (current.getAttribute("data-pipeline-key") === key) return;
+  current.replaceWith(renderPipelineChip());
+}
+
 function applyPipelinePayload(data) {
   state.pipeline.runUrl = data.run?.html_url || state.pipeline.runUrl || "";
   if (data.sha) state.pipeline.sha = String(data.sha).toLowerCase();
@@ -949,12 +974,14 @@ function applyPipelinePayload(data) {
   if (data.state === "unconfigured") {
     state.pipeline.state = "unconfigured";
     state.pipeline.message =
+      data.message ||
       "Set pandorga.content.workflow in _config.yml (e.g. content-pipeline.yml)";
     return;
   }
   state.pipeline.state = data.state || "idle";
   if (data.state === "error") {
-    state.pipeline.message = "Content pipeline failed for this commit.";
+    state.pipeline.message =
+      data.message || "Content pipeline failed for this commit.";
   }
 }
 
@@ -964,14 +991,11 @@ async function refreshPipelineStatus(sha = null) {
   try {
     const data = await studioApi.pipelineStatus(sha || null);
     applyPipelinePayload(data);
-    renderShell();
+    syncPipelineChip();
   } catch (err) {
-    const code = err?.code || "";
-    if (code === "actions_forbidden" || code === "github_unconfigured") {
-      state.pipeline.state = "error";
-      state.pipeline.message = String(err.message || err);
-      renderShell();
-    }
+    state.pipeline.state = "error";
+    state.pipeline.message = String(err.message || err);
+    syncPipelineChip();
   }
 }
 
@@ -986,7 +1010,7 @@ function armPipelineWatch(commitSha) {
   state.pipeline.sha = sha;
   state.pipeline.runUrl = "";
   state.pipeline.message = "";
-  renderShell();
+  syncPipelineChip();
   void pollPipelineStatus(gen, sha);
 }
 
@@ -1002,7 +1026,7 @@ async function pollPipelineStatus(gen, sha) {
       if (state.pipeline.state === "running" || state.pipeline.state === "awaiting_run") {
         state.pipeline.state = "stalled";
         state.pipeline.message = "Timed out waiting for the content pipeline.";
-        renderShell();
+        syncPipelineChip();
       }
       return;
     }
@@ -1014,15 +1038,15 @@ async function pollPipelineStatus(gen, sha) {
       applyPipelinePayload(data);
 
       if (data.state === "unconfigured" || data.state === "ok" || data.state === "error") {
-        renderShell();
+        syncPipelineChip();
         return;
       }
       if (data.state === "awaiting_run" && elapsed > STALL_MS) {
         state.pipeline.state = "stalled";
-        renderShell();
+        syncPipelineChip();
         return;
       }
-      renderShell();
+      syncPipelineChip();
     } catch (err) {
       if (gen !== state.pipeline.pollGen) return;
       softFails += 1;
@@ -1030,13 +1054,13 @@ async function pollPipelineStatus(gen, sha) {
       if (code === "actions_forbidden" || code === "github_unconfigured") {
         state.pipeline.state = "error";
         state.pipeline.message = String(err.message || err);
-        renderShell();
+        syncPipelineChip();
         return;
       }
       if (softFails >= 5) {
         state.pipeline.state = "error";
         state.pipeline.message = String(err.message || err);
-        renderShell();
+        syncPipelineChip();
         return;
       }
     }
@@ -1118,6 +1142,61 @@ function toolbarActionButton({
   );
 }
 
+function localExportPresentation() {
+  const exportBusy = state.reexporting || state.pipeline.state === "syncing";
+  return {
+    exportBusy,
+    className:
+      "btn btn-tool btn-reexport" +
+      (exportBusy ? " pipeline-running" : "") +
+      (state.pipeline.state === "ok" && !exportBusy ? " pipeline-ok" : "") +
+      (state.pipeline.state === "error" && !exportBusy ? " pipeline-error" : ""),
+    title: exportBusy
+      ? "Exporting content JSON locally"
+      : "Export content JSON locally and reload",
+    ariaLabel: exportBusy ? "Exporting locally" : "Export locally",
+    icon: exportBusy ? "progress_activity" : "sync",
+    label: exportBusy ? "Exporting…" : "Export",
+  };
+}
+
+/** Patch the local Export button without remounting the editor. */
+function syncLocalExportButton() {
+  const btn = document.querySelector("[data-studio-action='reexport']");
+  if (!btn) return;
+  const exp = localExportPresentation();
+  btn.className = exp.className;
+  btn.title = exp.title;
+  btn.setAttribute("aria-label", exp.ariaLabel);
+  btn.disabled = exp.exportBusy;
+  const icon = btn.querySelector(".material-symbols-outlined");
+  if (icon) {
+    icon.textContent = exp.icon;
+    icon.classList.toggle("studio-icon-spin", exp.exportBusy);
+  }
+  const label = btn.querySelector(".btn-label");
+  if (label) label.textContent = exp.label;
+}
+
+function syncToolbarStatus() {
+  const brand = document.querySelector(".studio-toolbar-brand");
+  if (!brand) return;
+  const statusText = state.error ? "Error" : state.status || "";
+  let pill = brand.querySelector(".studio-toolbar-status");
+  if (!statusText) {
+    if (pill) pill.remove();
+    return;
+  }
+  if (!pill) {
+    pill = el("span", { className: "status-pill studio-toolbar-status" });
+    brand.append(pill);
+  }
+  pill.className =
+    "status-pill studio-toolbar-status" + (state.error ? " error" : "");
+  pill.textContent = statusText;
+  pill.title = state.error || state.errorDetail || state.status || "";
+}
+
 function renderStudioToolbar({ brand = null, menuToggle = null } = {}) {
   const saveLabel = state.saving ? "Saving…" : state.dirty ? "Save" : "Saved";
   const saveIcon = state.saving ? "progress_activity" : state.dirty ? "save" : "check";
@@ -1138,24 +1217,18 @@ function renderStudioToolbar({ brand = null, menuToggle = null } = {}) {
 
   // Theme → pipeline/Export → Revert → Save. Pipeline chip is always present.
   if (isLocalDevHost()) {
-    const exportBusy = state.reexporting || state.pipeline.state === "syncing";
+    const exp = localExportPresentation();
     actions.push(
       toolbarActionButton({
-        className:
-          "btn btn-tool btn-reexport" +
-          (exportBusy ? " pipeline-running" : "") +
-          (state.pipeline.state === "ok" && !exportBusy ? " pipeline-ok" : "") +
-          (state.pipeline.state === "error" && !exportBusy ? " pipeline-error" : ""),
-        title: exportBusy
-          ? "Exporting content JSON locally"
-          : "Export content JSON locally and reload",
-        ariaLabel: exportBusy ? "Exporting locally" : "Export locally",
+        className: exp.className,
+        title: exp.title,
+        ariaLabel: exp.ariaLabel,
         action: "reexport",
-        disabled: exportBusy,
+        disabled: exp.exportBusy,
         onClick: () => reexportLocalContent(),
-        icon: exportBusy ? "progress_activity" : "sync",
-        label: exportBusy ? "Exporting…" : "Export",
-        spinning: exportBusy,
+        icon: exp.icon,
+        label: exp.label,
+        spinning: exp.exportBusy,
       })
     );
   } else {
@@ -1431,6 +1504,21 @@ function renderErrorBanner() {
   ]);
 }
 
+/** Show or hide the failure banner without rebuilding the editor. */
+function syncErrorBanner() {
+  const main = document.querySelector(".studio-main");
+  if (!main) return;
+  const existing = main.querySelector(":scope > .studio-error-banner");
+  const next = renderErrorBanner();
+  if (existing && next) existing.replaceWith(next);
+  else if (existing && !next) existing.remove();
+  else if (!existing && next) {
+    const crumb = main.querySelector(".studio-breadcrumb");
+    if (crumb) crumb.before(next);
+    else main.prepend(next);
+  }
+}
+
 function renderShell() {
   app.innerHTML = "";
   const groups = collectionGroups(state.schema);
@@ -4009,7 +4097,9 @@ async function reexportLocalContent() {
   state.pipeline.message = "";
   state.status = "Reexporting…";
   clearError();
-  renderShell();
+  syncToolbarStatus();
+  syncErrorBanner();
+  syncLocalExportButton();
   try {
     const res = await fetch("/__dev/reexport", {
       method: "POST",
@@ -4024,9 +4114,11 @@ async function reexportLocalContent() {
     if (!res.ok || !data.ok) {
       throw new Error((data && data.error) || `Export failed: ${res.status}`);
     }
+    state.reexporting = false;
     state.pipeline.state = "ok";
     state.status = "Reexported — reloading…";
-    renderShell();
+    syncToolbarStatus();
+    syncLocalExportButton();
     setTimeout(() => {
       try {
         const url = new URL(window.location.href);
@@ -4037,12 +4129,13 @@ async function reexportLocalContent() {
       }
     }, 200);
   } catch (err) {
+    state.reexporting = false;
     state.pipeline.state = "error";
     state.pipeline.message = String(err.message || err);
     captureError(err);
-    renderShell();
-  } finally {
-    state.reexporting = false;
+    syncToolbarStatus();
+    syncErrorBanner();
+    syncLocalExportButton();
   }
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pandorga
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.7
 platform: ruby
 authors:
 - The Pandorga contributors
@@ -412,6 +412,8 @@ files:
 - scripts/test/test-studio-api-contract.rb
 - scripts/test/test-studio-content-files.rb
 - scripts/test/test-studio-liquid-roundtrip.mjs
+- scripts/test/test-studio-pipeline-config.mjs
+- scripts/test/test-studio-pipeline-focus.mjs
 - scripts/test/test-studio-rate-limit.mjs
 - scripts/test/test-studio-rewrite-api-contract.rb
 - scripts/test/test-studio-rewrite-sanitize.mjs
@@ -449,8 +451,8 @@ files:
 - studio-app/src/preview/render.js
 - studio-app/src/styles/studio.css
 - studio-app/vite.config.js
+- studio/assets/index-BJyN-kB3.js
 - studio/assets/index-Cd1mlY_H.css
-- studio/assets/index-OAmrbW7i.js
 - studio/index.html
 - studio/schema.yml
 - templates/articles/README.md