release 1.41.8: CF staging fix + event-app improvements

.deploy/mta.yaml

@@ -10,7 +10,7 @@ ID: tutorials-ims
 # Bump this on each release you deploy — it's the version shown by `cf mtas`
 # and in the mtar filename (tutorials-ims_<version>.mtar). Deploy is manual:
 # `cd .deploy && mbt build && cf deploy mta_archives/tutorials-ims_<version>.mtar -e ../deploy/<env>.mtaext -f`.
-version: 1.41.7
+version: 1.41.8
 
 # Top-level parameters (overridable per-env via deploy/<env>.mtaext).
 parameters:

.github/workflows/rebuild-content-qa.yml

@@ -212,25 +212,26 @@ jobs:
           YOUTUBE_OAUTH_CLIENT_SECRET: ${{ secrets.YOUTUBE_OAUTH_CLIENT_SECRET }}
           YOUTUBE_OAUTH_REFRESH_TOKEN: ${{ secrets.YOUTUBE_OAUTH_REFRESH_TOKEN }}
 
-      # Author content-error routing (#2384). A slug-targeted QA run whose
+      # Author content-error routing (#2384, #2951). A slug-targeted QA run whose
       # source markdown could not be fetched (missing/misnamed file, e.g.
       # `tutorials/<slug>/architecture.md` instead of `<slug>.md`) is an AUTHOR
       # error, not an infra failure — fetch-tutorials records it in
       # `.tutorial-cache-qa/errors.json`, SKIPS the slug, and exits 0. Detect
-      # that here: if the effective target slug is among the fetch errors, the
-      # publish step is skipped (nothing rendered to publish → would otherwise
-      # throw the "--slug not found" exit 2 that failed the whole job) and a
-      # per-tutorial issue is filed against the source repo below. QA dispatches
-      # carry exactly ONE slug (notify-qa template), so at most one bad slug.
+      # that here so the downstream guard and publish steps only process slugs
+      # that actually rendered. Handles both single-slug (client_payload.slug)
+      # and multi-slug (client_payload.slugs) dispatches.
       - name: Detect author source errors
         id: source_errors
         env:
           EFFECTIVE_SLUG: ${{ github.event.client_payload.slug || inputs.slug }}
+          EFFECTIVE_SLUGS: ${{ github.event.client_payload.slugs }}
           SOURCE_REPO: ${{ github.event.client_payload.repo }}
         run: |
           set -uo pipefail
           ERRORS_FILE=".tutorial-cache-qa/errors.json"
           BAD_SLUG=""
+
+          # --- Single-slug path (original #2384 logic) ---
           if [ -n "$EFFECTIVE_SLUG" ] && [ -f "$ERRORS_FILE" ]; then
             # Was the requested slug among the fetch errors?
             if jq -e --arg s "$EFFECTIVE_SLUG" 'any(.[]; .slug == $s)' "$ERRORS_FILE" >/dev/null 2>&1; then
@@ -261,6 +262,32 @@ jobs:
             echo "bad_slug=" >> "$GITHUB_OUTPUT"
           fi
 
+          # --- Multi-slug path (#2951): filter client_payload.slugs against errors.json ---
+          # When a push touches N tutorials and some fail to fetch, only the
+          # successfully-rendered slugs should reach the guard and publish steps.
+          # bad_slugs  = comma-separated list of slugs that failed fetch
+          # good_slugs = comma-separated list of slugs that rendered successfully
+          GOOD_SLUGS=""
+          BAD_SLUGS=""
+          if [ -n "$EFFECTIVE_SLUGS" ] && [ -f "$ERRORS_FILE" ]; then
+            IFS=',' read -ra SLUG_ARRAY <<< "$EFFECTIVE_SLUGS"
+            for s in "${SLUG_ARRAY[@]}"; do
+              s="${s// /}"  # trim whitespace
+              [ -z "$s" ] && continue
+              if jq -e --arg slug "$s" 'any(.[]; .slug == $slug)' "$ERRORS_FILE" >/dev/null 2>&1; then
+                BAD_SLUGS="${BAD_SLUGS:+$BAD_SLUGS,}$s"
+                echo "::warning title=Author source error (multi)::Tutorial '$s' could not be fetched — skipping from multi-slug publish."
+              else
+                GOOD_SLUGS="${GOOD_SLUGS:+$GOOD_SLUGS,}$s"
+              fi
+            done
+          else
+            # No multi-slug payload, or no errors file — pass through unchanged.
+            GOOD_SLUGS="$EFFECTIVE_SLUGS"
+          fi
+          echo "bad_slugs=$BAD_SLUGS" >> "$GITHUB_OUTPUT"
+          echo "good_slugs=$GOOD_SLUGS" >> "$GITHUB_OUTPUT"
+
       # Resolve the tutorial's author (last committer of tutorials/<slug>/ in
       # the source repo, falling back to the dispatched commit's author) so the
       # per-tutorial issue can @-mention and best-effort-assign them. Uses the
@@ -425,12 +452,12 @@ jobs:
       # self-heal like prod), so this gate is the only thing standing between a
       # fingerprint-skewed deploy and unstyled /tutorials-qa/* pages.
       - name: Guard - approuter serves referenced CSS + islands (QA)
-        # Share the publish step's skip condition (line ~405): an author
-        # source-error (#2384) leaves no rendered page for the slug, and
-        # check-approuter-assets.cjs resolvePages() die()s (exit 1) on a missing
-        # page — without this `if:`, a benign author typo would become a red
-        # infra run and file a false failure issue.
-        if: ${{ steps.source_errors.outputs.bad_slug == '' }}
+        # Skip when the only targeted slug failed to fetch (#2384 single-slug),
+        # OR when all multi-slug targets failed to fetch (#2951 multi-slug):
+        # check-approuter-assets.cjs die()s on any slug with no rendered page.
+        # For partial multi-slug failures, good_slugs is non-empty and the guard
+        # runs against only the slugs that actually rendered.
+        if: ${{ steps.source_errors.outputs.bad_slug == '' && (steps.source_errors.outputs.good_slugs != '' || github.event.client_payload.slugs == '') }}
         env:
           # QA is a feature of PRODUCTION, not a separate environment: /tutorials-qa/*
           # is routed by the MAIN (prod) approuter (approuter/xs-app.json → srv-qa-api
@@ -441,12 +468,13 @@ jobs:
           # (2026-10-25).
           APPROUTER_URL: ${{ secrets.APPROUTER_URL_PROD }}
           # Match the publish step's PUBLISH_SLUG / PUBLISH_SLUGS expressions
-          # EXACTLY (lines 424/431) so the probe scope tracks the publish scope:
-          # a force-publish run ships the WHOLE catalog, so it must NOT pin the
-          # guard to one slug (that would gate 1 and strand ~1400 — the inverse
-          # of the bug this closes). check-approuter-assets.cjs reads both.
+          # EXACTLY so the probe scope tracks the publish scope: a force-publish
+          # run ships the WHOLE catalog, so it must NOT pin the guard to one slug.
+          # (#2951) Use good_slugs (fetch-error slugs filtered out) instead of the
+          # raw client_payload.slugs so the guard never checks a slug that Hugo
+          # never rendered.
           PUBLISH_SLUG: ${{ ((! inputs.force-publish) || inputs.allow-revert) && (github.event.client_payload.slug || inputs.slug) || '' }}
-          PUBLISH_SLUGS: ${{ (! inputs.force-publish) && github.event.client_payload.slugs || '' }}
+          PUBLISH_SLUGS: ${{ (! inputs.force-publish) && steps.source_errors.outputs.good_slugs || '' }}
         run: |
           SLUGS_ARG=""
           [ -n "$PUBLISH_SLUGS" ] && SLUGS_ARG="--slugs $PUBLISH_SLUGS"
@@ -460,7 +488,9 @@ jobs:
         # #2384): nothing rendered for it, so a slug-scoped publish would throw
         # the "--slug not found" exit 2 and fail the whole job. A full rebuild
         # (empty bad_slug) and a healthy slug-targeted run both publish normally.
-        if: ${{ steps.source_errors.outputs.bad_slug == '' }}
+        # For multi-slug with partial failures, bad_slug is empty and good_slugs
+        # contains only the slugs that rendered — publish proceeds on those.
+        if: ${{ steps.source_errors.outputs.bad_slug == '' && (steps.source_errors.outputs.good_slugs != '' || github.event.client_payload.slugs == '') }}
         # allow-revert path (per-slug #672 override): the server-side guard is only
         # reached at COMMIT, but publish-content.ts's client-side #672 short-circuit
         # (source+html hash match) drops the slug BEFORE commit — and --allow-revert
@@ -483,10 +513,9 @@ jobs:
           # Multi-slug (N-tutorial push) companion. Scope the publish to exactly
           # the changed slugs when the notify template sent a validated
           # client_payload.slugs — publish-content.ts reads PUBLISH_SLUGS as the
-          # --slugs fallback (filterToSlugs). Empty on force-publish (full
-          # re-seed) and on single-slug/allow-revert runs. Payload-only (no
-          # inputs.slugs — the QA workflow_dispatch has no slugs input).
-          PUBLISH_SLUGS: ${{ (! inputs.force-publish) && github.event.client_payload.slugs || '' }}
+          # --slugs fallback (filterToSlugs). (#2951) Use good_slugs (fetch-error
+          # slugs filtered out) so publish never tries a slug Hugo skipped.
+          PUBLISH_SLUGS: ${{ (! inputs.force-publish) && steps.source_errors.outputs.good_slugs || '' }}
 
       # #1373 — synthetic watchdog. The publish step reporting success is not
       # proof rows landed: the render-concepts 404 that hid for days (#1372)
@@ -496,9 +525,9 @@ jobs:
       # run that the failure notifier below emails on.
       - name: Verify QA publish landed rows
         # Skipped when the publish step was skipped for an author source error
-        # (#2384) — there was no publish to verify, and the channel's existing
-        # rows are unchanged.
-        if: ${{ steps.source_errors.outputs.bad_slug == '' }}
+        # (#2384/#2951) — there was no publish to verify, and the channel's
+        # existing rows are unchanged.
+        if: ${{ steps.source_errors.outputs.bad_slug == '' && (steps.source_errors.outputs.good_slugs != '' || github.event.client_payload.slugs == '') }}
         uses: ./.github/actions/verify-publish-landed
         with:
           base-url: ${{ secrets.CAP_SRV_URL_QA }}

app/admin-annotations.cds

@@ -2213,6 +2213,8 @@ annotate AdminService.TutorialFeedback with {
                    { $Type: 'Common.ValueListParameterDisplayOnly', ValueListProperty: 'primaryTag' }
                  ]
                };
+  isIrrelevant     @Common.Label: 'Irrelevant';
+  irrelevantReason @Common.Label: 'Reason';
 };
 
 annotate AdminService.TutorialFeedback with @(
@@ -2224,7 +2226,7 @@ annotate AdminService.TutorialFeedback with @(
     TypeNamePlural: 'Submissions',
     Title: { Value: tutorialSlug }
   },
-  UI.SelectionFields: [tutorialSlug, wasAuthenticated, submittedAt],
+  UI.SelectionFields: [tutorialSlug, wasAuthenticated, submittedAt, isIrrelevant],
   UI.LineItem: [
     { Value: tutorialSlug },
     { Value: submittedAt },
@@ -2236,7 +2238,11 @@ annotate AdminService.TutorialFeedback with @(
     { Value: ratingStructure },
     { Value: ratingInteresting },
     { Value: ratingVisuals },
-    { Value: comment }
+    { Value: comment },
+    { Value: isIrrelevant,     Label: 'Irrelevant' },
+    { Value: irrelevantReason, Label: 'Reason' },
+    { $Type: 'UI.DataFieldForAction', Action: 'AdminService.markFeedbackIrrelevant',   Label: 'Mark Irrelevant' },
+    { $Type: 'UI.DataFieldForAction', Action: 'AdminService.unmarkFeedbackIrrelevant', Label: 'Unmark Irrelevant' }
   ],
   UI.FieldGroup #Ratings: { Data: [
     { Value: ratingUseCase },
@@ -2248,9 +2254,14 @@ annotate AdminService.TutorialFeedback with @(
     { Value: npsScore }
   ]},
   UI.FieldGroup #CommentGroup: { Data: [{ Value: comment }] },
+  UI.FieldGroup #FlagGroup: { Data: [
+    { Value: isIrrelevant },
+    { Value: irrelevantReason }
+  ]},
   UI.Facets: [
     { $Type: 'UI.ReferenceFacet', Label: 'Ratings', Target: '@UI.FieldGroup#Ratings' },
-    { $Type: 'UI.ReferenceFacet', Label: 'Comment', Target: '@UI.FieldGroup#CommentGroup' }
+    { $Type: 'UI.ReferenceFacet', Label: 'Comment', Target: '@UI.FieldGroup#CommentGroup' },
+    { $Type: 'UI.ReferenceFacet', Label: 'Relevance Flag', Target: '@UI.FieldGroup#FlagGroup' }
   ]
 );
 
@@ -2281,7 +2292,11 @@ annotate AdminService.TutorialFeedback with @UI: {
     { Value: ratingDuration,   Label: 'Duration' },
     { Value: ratingStructure,  Label: 'Structure' },
     { Value: ratingInteresting,Label: 'Interesting' },
-    { Value: ratingVisuals,    Label: 'Visuals' }
+    { Value: ratingVisuals,    Label: 'Visuals' },
+    { Value: isIrrelevant,     Label: 'Irrelevant' },
+    { Value: irrelevantReason, Label: 'Reason' },
+    { $Type: 'UI.DataFieldForAction', Action: 'AdminService.markFeedbackIrrelevant',   Label: 'Mark Irrelevant' },
+    { $Type: 'UI.DataFieldForAction', Action: 'AdminService.unmarkFeedbackIrrelevant', Label: 'Unmark Irrelevant' }
   ]
 };
 

app/display-app/src/event-stream.ts

@@ -1,5 +1,7 @@
 import { ref, readonly, onUnmounted } from 'vue'
 import { io, type Socket } from 'socket.io-client'
+import { reconcileBuckets } from './reconcile'
+import { completionsPerHour } from './rate'
 
 export interface Bucket {
   name: string
@@ -32,6 +34,7 @@ export function useEventStream() {
   let socket: Socket | null = null
   let demoInterval: ReturnType<typeof setInterval> | null = null
   let cronInterval: ReturnType<typeof setInterval> | null = null
+  let reconcileInterval: ReturnType<typeof setInterval> | null = null
   const messageTimestamps: number[] = []
   const bucketTimestamps = new Map<string, number[]>()
 
@@ -59,16 +62,15 @@ export function useEventStream() {
   }
 
   function speedApproximation(): number {
-    if (messageTimestamps.length < 3) return 0
-    const time = messageTimestamps[messageTimestamps.length - 1] - messageTimestamps[0]
-    if (time === 0) return 0
-    const approx = (60 * 60 * 1000) / time
-    return Math.round(approx * messageTimestamps.length)
+    // Driven by messageTimestamps, which is fed from completionTick (EVERY
+    // completion), so the rate reflects all activity — not only track-mapped
+    // completions. See rate.ts for why this matters (per-hour-stuck-at-0 bug).
+    return completionsPerHour(messageTimestamps)
   }
 
   function startCron() {
     cronInterval = setInterval(() => {
-      if (messageTimestamps.length < 3) return
+      if (messageTimestamps.length < 2) return
       removeOutdatedTimestamps()
       speed.value = speedApproximation()
 
@@ -92,7 +94,10 @@ export function useEventStream() {
     } else {
       buckets.value.push({ name: bucketName, count: 1, justUpdated: true })
     }
-    messageTimestamps.push(Date.now())
+    // NOTE: the overall "Tutorials Per Hour" rate is fed from completionTick
+    // (every completion), NOT here — a track completion fires BOTH completionTick
+    // and tutorialCompleted, so feeding the rate from both would double-count.
+    // This bucketTimestamps feed below stays (it drives per-bucket velocity).
 
     recentEvents.value = [
       { name: bucketName, timestamp: Date.now() },
@@ -110,41 +115,78 @@ export function useEventStream() {
     }, 1200)
   }
 
-  async function connect(baseUrl: string, eventId: number | string) {
-    connectionState.value = 'connecting'
-    errorMessage.value = ''
-    const url = String(baseUrl).replace(/\/+$/, '')
-
-    // Fetch initial bucket data from unauthenticated EventStreamService
+  // Fetch the authoritative getEventBuckets snapshot and apply it.
+  //
+  // mode='seed'  — initial load: adopt counts verbatim (sets up the board).
+  // mode='reconcile' — periodic heal: merge via reconcileBuckets so counts that
+  //   drifted below the snapshot (missed socket events) are corrected WITHOUT
+  //   rewinding counts the live socket has already advanced past. This is what
+  //   stops the all-day kiosk from silently falling behind and needing a manual
+  //   refresh — the historical "numbers don't update live" complaint.
+  //
+  // Returns false on a hard fetch failure so the initial seed can surface an error;
+  // reconcile passes ignore failures (transient; the next tick retries).
+  async function fetchBuckets(
+    url: string,
+    eventId: number | string,
+    mode: 'seed' | 'reconcile',
+  ): Promise<boolean> {
     try {
       const res = await fetch(`${url}/rest/event-stream/getEventBuckets(eventLegacyId=${eventId})`)
       if (res.status === 404) {
-        connectionState.value = 'error'
-        errorMessage.value = `Event ID ${eventId} not found. Verify the event exists and has the correct legacy ID.`
-        return
+        if (mode === 'seed') {
+          connectionState.value = 'error'
+          errorMessage.value = `Event ID ${eventId} not found. Verify the event exists and has the correct legacy ID.`
+        }
+        return false
       }
       if (!res.ok) throw new Error(`HTTP ${res.status}: ${res.statusText}`)
       const json = await res.json()
       // getEventBuckets returns { eventName, eventType, hasLogo, totalCompletions, buckets:[...] };
       // fall back to legacy array shapes for safety.
       const data: Array<{ bucketName: string; count: number }> =
         json.buckets ?? json.value ?? (Array.isArray(json) ? json : [])
-      // Empty buckets = event exists but no completions yet (a 404 event is rejected
-      // above). Don't error out — proceed to the socket so late completions render (#2294).
-      buckets.value = data.map(b => ({ name: b.bucketName, count: b.count, justUpdated: false }))
+      if (mode === 'seed') {
+        // Empty buckets = event exists but no completions yet (a 404 event is rejected
+        // above). Don't error out — proceed to the socket so late completions render (#2294).
+        buckets.value = data.map(b => ({ name: b.bucketName, count: b.count, justUpdated: false }))
+      } else {
+        // Heal drift: never rewind a count the live socket already advanced.
+        buckets.value = reconcileBuckets(buckets.value, data)
+      }
       sortBuckets()
       // Hero total = ALL window completions (track-independent). Older servers that
-      // don't send totalCompletions fall back to the bucket sum.
-      setTotalFromFetch(
+      // don't send totalCompletions fall back to the bucket sum. Monotonic on
+      // reconcile so a late socket tick isn't rewound by a slightly-stale snapshot.
+      const fetchedTotal =
         typeof json.totalCompletions === 'number'
           ? json.totalCompletions
           : buckets.value.reduce((sum, b) => sum + b.count, 0)
-      )
+      if (mode === 'seed') setTotalFromFetch(fetchedTotal)
+      else if (fetchedTotal > totalCount.value) setTotalFromFetch(fetchedTotal)
+      return true
     } catch (e) {
-      connectionState.value = 'error'
-      errorMessage.value = `Failed to fetch from ${url}: ${(e as Error).message}`
-      return
+      if (mode === 'seed') {
+        connectionState.value = 'error'
+        errorMessage.value = `Failed to fetch from ${url}: ${(e as Error).message}`
+      }
+      return false
     }
+  }
+
+  async function connect(baseUrl: string, eventId: number | string) {
+    connectionState.value = 'connecting'
+    errorMessage.value = ''
+    const url = String(baseUrl).replace(/\/+$/, '')
+
+    // Initial authoritative seed. Abort on hard failure (404 / network).
+    const seeded = await fetchBuckets(url, eventId, 'seed')
+    if (!seeded) return
+
+    // Periodic reconciliation (every 15s) — the safety net that lets the socket
+    // provide snappy live deltas while guaranteeing the board self-heals from any
+    // missed event over a long kiosk session. No page refresh required.
+    reconcileInterval = setInterval(() => { void fetchBuckets(url, eventId, 'reconcile') }, 15000)
 
     // Connect via Socket.IO to EventStreamService.
     // Use the default polling→upgrade transport order. A websocket-only pin
@@ -181,6 +223,11 @@ export function useEventStream() {
     // Hero "total activity" — one tick per completion (track or not).
     socket.on('completionTick', () => {
       totalCount.value++
+      // Feed the "Tutorials Per Hour" rate from EVERY completion (track or not).
+      // Previously the rate was fed only from tutorialCompleted (track-mapped),
+      // so events whose completions didn't resolve to a CompletionPath showed a
+      // permanently-zero per-hour. completionTick fires for all completions.
+      messageTimestamps.push(Date.now())
     })
 
     startCron()
@@ -207,6 +254,7 @@ export function useEventStream() {
     if (socket) { socket.disconnect(); socket = null }
     if (demoInterval) { clearInterval(demoInterval); demoInterval = null }
     if (cronInterval) { clearInterval(cronInterval); cronInterval = null }
+    if (reconcileInterval) { clearInterval(reconcileInterval); reconcileInterval = null }
     connectionState.value = 'idle'
   }