@startsimpli/ui 0.4.74 → 0.4.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startsimpli/ui",
-  "version": "0.4.74",
+  "version": "0.4.75",
   "description": "Shared UI components package for StartSimpli applications",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -42,8 +42,8 @@
     "next": "^14.0.0 || ^15.0.0 || ^16.0.0",
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0",
-    "@startsimpli/auth": "^0.4.31",
-    "@startsimpli/api": "^0.5.46"
+    "@startsimpli/api": "^0.5.46",
+    "@startsimpli/auth": "^0.4.31"
   },
   "peerDependenciesMeta": {
     "@startsimpli/api": {

package/src/components/collection/DraftReviewWorkspace.tsx

@@ -10,7 +10,7 @@
  */
 import { useMemo, useState } from 'react';
 import { useQuery, useQueryClient } from '@tanstack/react-query';
-import { ShieldCheck, AlertTriangle, ExternalLink, CheckCircle2, Circle } from 'lucide-react';
+import { ShieldCheck, AlertTriangle, ExternalLink, CheckCircle2, Circle, ChevronDown } from 'lucide-react';
 
 import { Button } from '../ui/button';
 import { Badge } from '../ui/badge';
@@ -28,6 +28,7 @@ import {
   wordTargets,
   sourceOverlapCheck,
   pickChanges,
+  isRejectedTopicGroup,
   type DraftGroup,
   type DraftSource,
   type CheckStatus,
@@ -66,6 +67,22 @@ export function DraftReviewWorkspace({ client }: DraftReviewWorkspaceProps) {
   });
   const records = recordsQ.data ?? [];
 
+  // A story whose topic was rejected shouldn't keep cluttering the review — its
+  // drafts collapse into the "Rejected" section, mirroring the topic list
+  // (startsim-ay9l follow-up). draft.topic_ref is the topic's entity id.
+  const topicsQ = useQuery({
+    queryKey: ['entities', 'topic', 'all'],
+    queryFn: () => client.listAllEntities('topic'),
+    enabled: !!draftType,
+  });
+  const rejectedTopicIds = useMemo(() => {
+    const s = new Set<string>();
+    for (const t of topicsQ.data ?? []) {
+      if (String(readData(t.data, 'status') ?? '') === 'rejected') s.add(String(t.id));
+    }
+    return s;
+  }, [topicsQ.data]);
+
   const sourcesQ = useQuery({
     queryKey: ['entities', 'source', 'all'],
     queryFn: () => client.listAllEntities('source'),
@@ -82,8 +99,17 @@ export function DraftReviewWorkspace({ client }: DraftReviewWorkspaceProps) {
   }, [sourcesQ.data]);
 
   const groups = useMemo(() => groupDrafts(records), [records]);
+  const { activeGroups, rejectedGroups } = useMemo(() => {
+    const act: DraftGroup[] = [];
+    const rej: DraftGroup[] = [];
+    for (const g of groups) {
+      (isRejectedTopicGroup(g, rejectedTopicIds) ? rej : act).push(g);
+    }
+    return { activeGroups: act, rejectedGroups: rej };
+  }, [groups, rejectedTopicIds]);
   const [openId, setOpenId] = useState<string | null>(null);
   const [busyKey, setBusyKey] = useState<string | null>(null);
+  const [showRejected, setShowRejected] = useState(false);
 
   async function writeEntity(record: EntityRecord, changes: Record<string, unknown>) {
     const data: Record<string, unknown> = { ...record.data };
@@ -128,8 +154,22 @@ export function DraftReviewWorkspace({ client }: DraftReviewWorkspaceProps) {
     return <p className="text-sm text-gray-500">No “draft” type is defined for this app.</p>;
   }
 
-  const pickedCount = groups.filter((g) => g.chosen).length;
-  const readyCount = groups.filter((g) => g.ready).length;
+  const pickedCount = activeGroups.filter((g) => g.chosen).length;
+  const readyCount = activeGroups.filter((g) => g.ready).length;
+
+  const renderGroup = (g: DraftGroup) => (
+    <StoryGroup
+      key={g.key}
+      group={g}
+      tierByDomain={tierByDomain}
+      openId={openId}
+      onToggleOpen={(id) => setOpenId((cur) => (cur === id ? null : id))}
+      onPick={pick}
+      onMarkReady={markReady}
+      busy={busyKey === g.key}
+      busyId={busyKey}
+    />
+  );
 
   return (
     <div className="space-y-6">
@@ -142,30 +182,41 @@ export function DraftReviewWorkspace({ client }: DraftReviewWorkspaceProps) {
           </p>
         </div>
         <span className="text-sm text-gray-500">
-          {groups.length} stories · {pickedCount} picked · {readyCount} ready to post
+          {activeGroups.length} stories · {pickedCount} picked · {readyCount} ready to post
         </span>
       </div>
 
-      {groups.length === 0 ? (
+      {activeGroups.length === 0 && rejectedGroups.length === 0 ? (
         <p className="rounded-lg border border-dashed border-gray-300 p-8 text-center text-sm text-gray-500">
           No drafts yet. Move a topic to “ready” and the writer will generate candidates here.
         </p>
       ) : (
-        <ol className="space-y-4">
-          {groups.map((g) => (
-            <StoryGroup
-              key={g.key}
-              group={g}
-              tierByDomain={tierByDomain}
-              openId={openId}
-              onToggleOpen={(id) => setOpenId((cur) => (cur === id ? null : id))}
-              onPick={pick}
-              onMarkReady={markReady}
-              busy={busyKey === g.key}
-              busyId={busyKey}
-            />
-          ))}
-        </ol>
+        <>
+          {activeGroups.length > 0 ? (
+            <ol className="space-y-4">{activeGroups.map(renderGroup)}</ol>
+          ) : (
+            <p className="rounded-lg border border-dashed border-gray-300 p-6 text-center text-sm text-gray-500">
+              No active stories — the rest are rejected (below).
+            </p>
+          )}
+
+          {rejectedGroups.length > 0 && (
+            <div className="rounded-lg border border-border">
+              <button
+                type="button"
+                onClick={() => setShowRejected((v) => !v)}
+                className="flex w-full items-center justify-between rounded-lg px-4 py-2.5 text-sm font-medium text-gray-500 hover:bg-gray-50"
+                aria-expanded={showRejected}
+              >
+                <span>Rejected ({rejectedGroups.length})</span>
+                <ChevronDown className={`h-4 w-4 transition-transform ${showRejected ? 'rotate-180' : ''}`} />
+              </button>
+              {showRejected && (
+                <ol className="space-y-4 border-t border-border p-4">{rejectedGroups.map(renderGroup)}</ol>
+              )}
+            </div>
+          )}
+        </>
       )}
     </div>
   );

package/src/components/collection/__tests__/drafts.test.ts

@@ -1,4 +1,4 @@
-import { parseSources, normUrl, groupKeyOf, groupDrafts, candidateTitle, gradeWords, wordTargets, sourceOverlapCheck, pickChanges } from '../drafts';
+import { parseSources, normUrl, groupKeyOf, groupDrafts, candidateTitle, gradeWords, wordTargets, sourceOverlapCheck, pickChanges, isRejectedTopicGroup } from '../drafts';
 import type { EntityRecord } from '../types';
 
 function rec(id: string, name: string, data: Record<string, unknown>): EntityRecord {
@@ -134,3 +134,20 @@ describe('pickChanges (startsim-yvd3 — pick must not write an invalid status)'
     expect(pickChanges(7 as unknown as string, 8 as unknown as string)).toEqual({ chosen: false });
   });
 });
+
+describe('isRejectedTopicGroup (startsim-ay9l — collapse drafts of rejected topics)', () => {
+  const grp = (topicRef: string) => groupDrafts([
+    rec('d1', 'S', { candidate_index: 1, topic_ref: topicRef, topic_title: 'Story', sources: 'x (2026-01-01) https://a.com/1' }),
+  ])[0];
+
+  it('is true when the group topic id is in the rejected set', () => {
+    expect(isRejectedTopicGroup(grp('topic-uuid-1'), new Set(['topic-uuid-1']))).toBe(true);
+  });
+  it('is false when the topic is not rejected', () => {
+    expect(isRejectedTopicGroup(grp('topic-uuid-2'), new Set(['topic-uuid-1']))).toBe(false);
+  });
+  it('is false when the group has no topic_ref', () => {
+    const g = groupDrafts([rec('d2', 'S2', { candidate_index: 1, sources: 'x (2026-01-01) https://b.com/1' })])[0];
+    expect(isRejectedTopicGroup(g, new Set(['']))).toBe(false);
+  });
+});

package/src/components/collection/drafts.ts

@@ -138,6 +138,16 @@ export function groupDrafts(records: EntityRecord[]): DraftGroup[] {
   return groups.sort((a, b) => rank(a) - rank(b) || a.label.localeCompare(b.label));
 }
 
+/**
+ * True when a draft story-group belongs to a REJECTED topic — used to collapse
+ * those stories out of the active review (startsim-ay9l). A draft's `topic_ref`
+ * is the topic's entity id (String), so callers pass a set of rejected topic ids.
+ */
+export function isRejectedTopicGroup(group: DraftGroup, rejectedTopicIds: Set<string>): boolean {
+  const topicRef = str(readData(group.candidates[0]?.data, 'topic_ref'));
+  return topicRef !== '' && rejectedTopicIds.has(topicRef);
+}
+
 /** Word-count targets by content type, from the OGMC skill specs (generic defaults). */
 export function wordTargets(contentType: string): { blog: [number, number]; linkedin: [number, number] } {
   switch (contentType) {