@commonpub/layer 0.58.0 → 0.59.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commonpub/layer",
-  "version": "0.58.0",
+  "version": "0.59.0",
   "type": "module",
   "main": "./nuxt.config.ts",
   "files": [
@@ -53,16 +53,16 @@
     "vue": "^3.4.0",
     "vue-router": "^4.3.0",
     "zod": "^4.3.6",
+    "@commonpub/auth": "0.8.0",
     "@commonpub/config": "0.18.0",
+    "@commonpub/docs": "0.6.3",
     "@commonpub/editor": "0.7.11",
     "@commonpub/explainer": "0.7.15",
-    "@commonpub/learning": "0.5.2",
     "@commonpub/schema": "0.33.0",
-    "@commonpub/auth": "0.8.0",
     "@commonpub/server": "2.80.0",
+    "@commonpub/ui": "0.9.2",
     "@commonpub/protocol": "0.13.0",
-    "@commonpub/docs": "0.6.3",
-    "@commonpub/ui": "0.9.2"
+    "@commonpub/learning": "0.5.2"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.9.1",

package/pages/contests/[slug]/edit.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { ContestStage } from '@commonpub/schema';
+import type { Serialized, ContestEntryItem } from '@commonpub/server';
 
 definePageMeta({ middleware: 'auth' });
 
@@ -226,6 +227,35 @@ const statusAction = contestStatusAction;
 // Phase B2 — advancement cuts. Operates on the PERSISTED stages (contest.value),
 // not the editable `stages` ref, since it acts on real entries.
 const reviewStages = computed(() => (contest.value?.stages ?? []).filter((s) => s.kind === 'review'));
+
+// Entries (the cohort) — for the manual advancement picker. The eligible set is
+// everyone not already eliminated by a prior round's cut.
+const { data: entriesData, refresh: refreshEntries } = useLazyFetch<{ items: Serialized<ContestEntryItem>[] }>(`/api/contests/${slug}/entries`);
+const eligibleEntries = computed(() => (entriesData.value?.items ?? []).filter((e) => !e.eliminated));
+const advanceMode = ref<Record<string, 'topN' | 'manual'>>({});
+const manualPick = ref<Record<string, string[]>>({});
+function toggleManual(stageId: string, entryId: string): void {
+  const cur = manualPick.value[stageId] ?? [];
+  manualPick.value[stageId] = cur.includes(entryId) ? cur.filter((x) => x !== entryId) : [...cur, entryId];
+}
+async function advanceStageManual(stageId: string): Promise<void> {
+  const ids = manualPick.value[stageId] ?? [];
+  if (!ids.length) { toast.error('Select at least one entry to advance.'); return; }
+  if (!confirm(`Advance the ${ids.length} selected ${ids.length === 1 ? 'entry' : 'entries'}? The rest of the cohort is marked "not advanced" and drops out of later judging + final results.`)) return;
+  advancing.value = stageId;
+  try {
+    const r = await $fetch<{ advancedCount: number; eliminatedCount: number }>(`/api/contests/${slug}/advance`, {
+      method: 'POST',
+      body: { reviewStageId: stageId, mode: 'manual', advancedEntryIds: ids },
+    });
+    toast.success(`${r.advancedCount} advanced, ${r.eliminatedCount} not advanced.`);
+    await Promise.all([refresh(), refreshEntries()]);
+  } catch (err: unknown) {
+    toast.error(extractError(err));
+  } finally {
+    advancing.value = null;
+  }
+}
 async function advanceStage(stageId: string): Promise<void> {
   const topN = advanceN.value[stageId];
   if (!topN || topN < 1) { toast.error('Enter how many entries advance.'); return; }
@@ -237,7 +267,7 @@ async function advanceStage(stageId: string): Promise<void> {
       body: { reviewStageId: stageId, mode: 'topN', topN },
     });
     toast.success(`${r.advancedCount} advanced, ${r.eliminatedCount} not advanced.`);
-    await refresh();
+    await Promise.all([refresh(), refreshEntries()]);
   } catch (err: unknown) {
     toast.error(extractError(err));
   } finally {
@@ -344,15 +374,36 @@ async function transitionStatus(newStatus: string): Promise<void> {
       <section v-if="reviewStages.length" class="cpub-form-section">
         <h2 class="cpub-form-section-title">Advancement</h2>
         <p class="cpub-form-hint">Multi-round contests: after judging a review stage, advance the top entries to the next stage. Entries below the cut are marked "not advanced" and excluded from later judging + final results. Re-running re-computes the cut. (Save any stage changes above first.)</p>
-        <div v-for="rs in reviewStages" :key="rs.id" class="cpub-advance-row">
-          <span class="cpub-advance-name"><i class="fa-solid fa-gavel"></i> {{ rs.name }}</span>
-          <div class="cpub-advance-ctl">
+        <div v-for="rs in reviewStages" :key="rs.id" class="cpub-advance-block">
+          <div class="cpub-advance-row">
+            <span class="cpub-advance-name"><i class="fa-solid fa-gavel"></i> {{ rs.name }}</span>
+            <div class="cpub-advance-mode">
+              <label class="cpub-form-check"><input type="radio" :name="`mode-${rs.id}`" :checked="(advanceMode[rs.id] ?? 'topN') === 'topN'" @change="advanceMode[rs.id] = 'topN'" /> <span>Top N</span></label>
+              <label class="cpub-form-check"><input type="radio" :name="`mode-${rs.id}`" :checked="advanceMode[rs.id] === 'manual'" @change="advanceMode[rs.id] = 'manual'" /> <span>Pick manually</span></label>
+            </div>
+          </div>
+
+          <div v-if="(advanceMode[rs.id] ?? 'topN') === 'topN'" class="cpub-advance-ctl">
             <label class="cpub-form-label" :for="`adv-${rs.id}`">Advance top</label>
             <input :id="`adv-${rs.id}`" v-model.number="advanceN[rs.id]" type="number" min="1" class="cpub-form-input cpub-advance-n" placeholder="50" />
             <button type="button" class="cpub-btn cpub-btn-sm" :disabled="advancing === rs.id" @click="advanceStage(rs.id)">
               <i class="fa-solid fa-arrow-up-right-dots"></i> {{ advancing === rs.id ? 'Advancing…' : 'Advance' }}
             </button>
           </div>
+
+          <div v-else class="cpub-advance-manual">
+            <p v-if="!eligibleEntries.length" class="cpub-form-hint" style="margin: 0;">No entries in the current cohort to pick from yet.</p>
+            <template v-else>
+              <label v-for="e in eligibleEntries" :key="e.id" class="cpub-advance-pick">
+                <input type="checkbox" :checked="(manualPick[rs.id] ?? []).includes(e.id)" @change="toggleManual(rs.id, e.id)" />
+                <span class="cpub-advance-pick-title">{{ e.contentTitle }}</span>
+                <span v-if="e.score != null" class="cpub-advance-pick-score">{{ e.score }}</span>
+              </label>
+              <button type="button" class="cpub-btn cpub-btn-sm" :disabled="advancing === rs.id || !(manualPick[rs.id] ?? []).length" @click="advanceStageManual(rs.id)">
+                <i class="fa-solid fa-arrow-up-right-dots"></i> {{ advancing === rs.id ? 'Advancing…' : `Advance ${(manualPick[rs.id] ?? []).length} selected` }}
+              </button>
+            </template>
+          </div>
         </div>
       </section>
 
@@ -638,13 +689,20 @@ async function transitionStatus(newStatus: string): Promise<void> {
   border-top: 2px solid var(--border);
   box-shadow: var(--shadow-lg);
 }
-.cpub-advance-row { display: flex; align-items: center; justify-content: space-between; gap: 12px; flex-wrap: wrap; padding: 10px 0; border-top: var(--border-width-default) solid var(--border); }
-.cpub-advance-row:first-of-type { border-top: 0; }
+.cpub-advance-block { padding: 12px 0; border-top: var(--border-width-default) solid var(--border); }
+.cpub-advance-block:first-of-type { border-top: 0; }
+.cpub-advance-row { display: flex; align-items: center; justify-content: space-between; gap: 12px; flex-wrap: wrap; }
 .cpub-advance-name { font-size: 13px; font-weight: 600; display: inline-flex; align-items: center; gap: 8px; }
 .cpub-advance-name i { color: var(--accent); font-size: 11px; }
-.cpub-advance-ctl { display: inline-flex; align-items: center; gap: 8px; }
+.cpub-advance-mode { display: inline-flex; gap: 12px; }
+.cpub-advance-ctl { display: inline-flex; align-items: center; gap: 8px; margin-top: 10px; }
 .cpub-advance-ctl .cpub-form-label { margin: 0; }
 .cpub-advance-n { width: 80px; }
+.cpub-advance-manual { margin-top: 10px; display: flex; flex-direction: column; gap: 4px; }
+.cpub-advance-pick { display: flex; align-items: center; gap: 8px; font-size: 12px; color: var(--text-dim); padding: 4px 8px; border: var(--border-width-default) solid var(--border); background: var(--surface2); cursor: pointer; }
+.cpub-advance-pick-title { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.cpub-advance-pick-score { font-family: var(--font-mono); font-size: 11px; color: var(--accent); flex-shrink: 0; }
+.cpub-advance-manual .cpub-btn { align-self: flex-start; margin-top: 6px; }
 .cpub-edit-actionbar-status { font-size: 11px; font-family: var(--font-mono); text-transform: uppercase; letter-spacing: .06em; color: var(--text-faint); display: flex; align-items: center; gap: 8px; }
 .cpub-edit-actionbar-btns { display: flex; align-items: center; gap: 8px; }