From 2dab2a7c2df1bca8e48e1b905998169e0e08ef9c Mon Sep 17 00:00:00 2001
From: Hamza Alqurneh <hamza@simplify9.com>
Date: Mon, 31 Aug 2026 10:01:34 +0300
Subject: [PATCH 1/2] fix: scheduled-job overdue label, retry-alert button
 wrap, and Monaco CSP block

Found while doing a demo QA pass on Scheduled jobs, retry policies, and the
Scriban mapper editor.
---
 .../ClientApp/src/components/ui/basics.tsx    |  2 +-
 SW.Bitween.Web/ClientApp/src/lib/dates.ts     | 24 ++++++++++++-------
 SW.Bitween.Web/Startup.cs                     |  8 +++++--
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/SW.Bitween.Web/ClientApp/src/components/ui/basics.tsx b/SW.Bitween.Web/ClientApp/src/components/ui/basics.tsx
index ed84d77c..4a33a671 100644
--- a/SW.Bitween.Web/ClientApp/src/components/ui/basics.tsx
+++ b/SW.Bitween.Web/ClientApp/src/components/ui/basics.tsx
@@ -30,7 +30,7 @@ export function Button({
     <button
       type="button"
       disabled={disabled || busy}
-      className={`inline-flex items-center justify-center gap-1.5 rounded-lg font-medium transition-colors cursor-pointer disabled:cursor-not-allowed ${
+      className={`inline-flex items-center justify-center gap-1.5 whitespace-nowrap rounded-lg font-medium transition-colors cursor-pointer disabled:cursor-not-allowed ${
         size === "sm" ? "h-8 px-3 text-[13px]" : "h-9.5 px-4 text-sm"
       } ${buttonStyles[variant]} ${className}`}
       {...rest}
diff --git a/SW.Bitween.Web/ClientApp/src/lib/dates.ts b/SW.Bitween.Web/ClientApp/src/lib/dates.ts
index 8a459801..65702fd3 100644
--- a/SW.Bitween.Web/ClientApp/src/lib/dates.ts
+++ b/SW.Bitween.Web/ClientApp/src/lib/dates.ts
@@ -23,16 +23,24 @@ export const timeAgo = (iso: string): string => {
   return formatDate(iso);
 };
 
-/** "in 34m", "in 2h" — for things scheduled in the future. */
+/** "in 34m", "in 2h" for the future; "overdue by 3d" once a schedule has been missed a while. */
 export const timeUntil = (iso: string): string => {
   const seconds = (new Date(iso).getTime() - Date.now()) / 1000;
-  if (seconds <= 0) return "any moment";
-  if (seconds < 90) return "in under a minute";
-  const minutes = seconds / 60;
-  if (minutes < 60) return `in ${Math.round(minutes)}m`;
-  const hours = minutes / 60;
-  if (hours < 24) return `in ${Math.round(hours)}h`;
-  return `in ${Math.round(hours / 24)}d`;
+  if (seconds > 0) {
+    if (seconds < 90) return "in under a minute";
+    const minutes = seconds / 60;
+    if (minutes < 60) return `in ${Math.round(minutes)}m`;
+    const hours = minutes / 60;
+    if (hours < 24) return `in ${Math.round(hours)}h`;
+    return `in ${Math.round(hours / 24)}d`;
+  }
+  const overdue = -seconds;
+  if (overdue < 30) return "any moment";
+  const minutes = overdue / 60;
+  if (minutes < 90) return `overdue by ${Math.max(1, Math.round(minutes))}m`;
+  const hours = overdue / 3600;
+  if (hours < 48) return `overdue by ${Math.round(hours)}h`;
+  return `overdue by ${Math.round(overdue / 86400)}d`;
 };
 
 const timeFormatter = new Intl.DateTimeFormat("en", {
diff --git a/SW.Bitween.Web/Startup.cs b/SW.Bitween.Web/Startup.cs
index 45878e11..6c7054f0 100644
--- a/SW.Bitween.Web/Startup.cs
+++ b/SW.Bitween.Web/Startup.cs
@@ -416,8 +416,12 @@ public void ConfigureServices(IServiceCollection services)
         /// <summary>Mirrors the policy the legacy UI enforces at nginx, minus its nginx-only bits.</summary>
         private const string ContentSecurityPolicy =
             "default-src 'self'; " +
-            "script-src 'self'; " +
-            "style-src 'self' 'unsafe-inline'; " +
+            // The Scriban mapping editor lazy-loads Monaco, which fetches its script,
+            // stylesheet and language workers from jsdelivr — each needs an explicit
+            // allowance beyond 'self'.
+            "script-src 'self' https://cdn.jsdelivr.net; " +
+            "worker-src 'self' blob: https://cdn.jsdelivr.net; " +
+            "style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net; " +
             "img-src 'self' data:; " +
             "connect-src 'self' https://login.microsoftonline.com; " +
             "frame-src https://login.microsoftonline.com; " +

From b97c75c017fbdb042dcbe3bd69da1db5db01c9fa Mon Sep 17 00:00:00 2001
From: Hamza Alqurneh <hamza@simplify9.com>
Date: Mon, 31 Aug 2026 10:14:25 +0300
Subject: [PATCH 2/2] fix: address CodeRabbit findings on PR #279
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- timeUntil now validates the input date and returns "—" instead of
  "overdue by NaNd" for an invalid one, matching formatDate.
- Pin the Monaco loader to an exact jsdelivr path instead of trusting
  the whole cdn.jsdelivr.net origin in CSP.
---
 SW.Bitween.Web/ClientApp/package.json                 |  1 +
 .../ClientApp/src/components/mapper/ManualEditor.tsx  |  5 +++++
 SW.Bitween.Web/ClientApp/src/lib/dates.ts             |  4 +++-
 SW.Bitween.Web/ClientApp/yarn.lock                    |  2 +-
 SW.Bitween.Web/Startup.cs                             | 11 ++++++-----
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/SW.Bitween.Web/ClientApp/package.json b/SW.Bitween.Web/ClientApp/package.json
index 9d82fbce..b18dda7a 100644
--- a/SW.Bitween.Web/ClientApp/package.json
+++ b/SW.Bitween.Web/ClientApp/package.json
@@ -16,6 +16,7 @@
     "@fontsource-variable/instrument-sans": "^5.2.8",
     "@fontsource-variable/jetbrains-mono": "^5.2.8",
     "@headlessui/react": "^2.2.10",
+    "@monaco-editor/loader": "^1.7.0",
     "@monaco-editor/react": "^4.7.0",
     "@tailwindcss/vite": "^4.3.2",
     "@tanstack/react-query": "^5.101.2",
diff --git a/SW.Bitween.Web/ClientApp/src/components/mapper/ManualEditor.tsx b/SW.Bitween.Web/ClientApp/src/components/mapper/ManualEditor.tsx
index c645818a..a21078cd 100644
--- a/SW.Bitween.Web/ClientApp/src/components/mapper/ManualEditor.tsx
+++ b/SW.Bitween.Web/ClientApp/src/components/mapper/ManualEditor.tsx
@@ -1,4 +1,5 @@
 import React, { lazy, Suspense, useEffect, useRef } from "react";
+import loader from "@monaco-editor/loader";
 import {
   useMappingEditorDispatch,
   useMappingEditorState,
@@ -9,6 +10,10 @@ import {
 } from "../../lib/mapping/MappingEditorContext";
 import { generateScriban, parseScriban } from "../../lib/mapping/scribanGenerator";
 
+// Pinned to an exact version so the CSP entries in Startup.cs (which allow only
+// this path, not all of cdn.jsdelivr.net) stay valid — bump both together.
+loader.config({ paths: { vs: "https://cdn.jsdelivr.net/npm/monaco-editor@0.55.1/min/vs" } });
+
 // Monaco is heavy — lazy-load it so it stays out of the main bundle.
 const MonacoEditor = lazy(() => import("@monaco-editor/react"));
 
diff --git a/SW.Bitween.Web/ClientApp/src/lib/dates.ts b/SW.Bitween.Web/ClientApp/src/lib/dates.ts
index 65702fd3..12eec5e9 100644
--- a/SW.Bitween.Web/ClientApp/src/lib/dates.ts
+++ b/SW.Bitween.Web/ClientApp/src/lib/dates.ts
@@ -25,7 +25,9 @@ export const timeAgo = (iso: string): string => {
 
 /** "in 34m", "in 2h" for the future; "overdue by 3d" once a schedule has been missed a while. */
 export const timeUntil = (iso: string): string => {
-  const seconds = (new Date(iso).getTime() - Date.now()) / 1000;
+  const d = asDate(iso);
+  if (!d) return "—";
+  const seconds = (d.getTime() - Date.now()) / 1000;
   if (seconds > 0) {
     if (seconds < 90) return "in under a minute";
     const minutes = seconds / 60;
diff --git a/SW.Bitween.Web/ClientApp/yarn.lock b/SW.Bitween.Web/ClientApp/yarn.lock
index b89e15cc..d2f99d00 100644
--- a/SW.Bitween.Web/ClientApp/yarn.lock
+++ b/SW.Bitween.Web/ClientApp/yarn.lock
@@ -163,7 +163,7 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@monaco-editor/loader@^1.5.0":
+"@monaco-editor/loader@^1.5.0", "@monaco-editor/loader@^1.7.0":
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.7.0.tgz#967aaa4601b19e913627688dfe8159d57549e793"
   integrity sha512-gIwR1HrJrrx+vfyOhYmCZ0/JcWqG5kbfG7+d3f/C1LXk2EvzAbHSg3MQ5lO2sMlo9izoAZ04shohfKLVT6crVA==
diff --git a/SW.Bitween.Web/Startup.cs b/SW.Bitween.Web/Startup.cs
index 6c7054f0..ef891316 100644
--- a/SW.Bitween.Web/Startup.cs
+++ b/SW.Bitween.Web/Startup.cs
@@ -417,11 +417,12 @@ public void ConfigureServices(IServiceCollection services)
         private const string ContentSecurityPolicy =
             "default-src 'self'; " +
             // The Scriban mapping editor lazy-loads Monaco, which fetches its script,
-            // stylesheet and language workers from jsdelivr — each needs an explicit
-            // allowance beyond 'self'.
-            "script-src 'self' https://cdn.jsdelivr.net; " +
-            "worker-src 'self' blob: https://cdn.jsdelivr.net; " +
-            "style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net; " +
+            // stylesheet and language workers from jsdelivr. Pinned to the exact
+            // version path ManualEditor.tsx configures the loader with — not the
+            // whole jsdelivr origin — so this must move in lockstep with that pin.
+            "script-src 'self' https://cdn.jsdelivr.net/npm/monaco-editor@0.55.1/; " +
+            "worker-src 'self' blob: https://cdn.jsdelivr.net/npm/monaco-editor@0.55.1/; " +
+            "style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net/npm/monaco-editor@0.55.1/; " +
             "img-src 'self' data:; " +
             "connect-src 'self' https://login.microsoftonline.com; " +
             "frame-src https://login.microsoftonline.com; " +