@preventive/triage 1.0.0-alpha.52 → 1.0.0-alpha.53

package/common/managed/finding-detail.d.ts

@@ -1,3 +1,5 @@
 export const FINDING_DETAIL_FIELDS: readonly string[]
-export function liteReportData(data: unknown, options?: { fold?: boolean }): unknown
-export function liteWorkspace<T extends { filename: string; data: unknown }>(reports: readonly T[], links: readonly (readonly string[])[]): { reports: T[]; folded: boolean }
+export function liteReportData(data: unknown, options?: { fold?: boolean; shown?: ReadonlySet<string> | null }): unknown
+export function liteWorkspace<T extends { filename: string; data: unknown }>(reports: readonly T[], links: readonly (readonly string[])[]): {
+  reports: T[]; folded: false | 'rows' | 'app'; lens: { drop: boolean; detail: boolean; upstream: boolean } | null
+}

package/common/managed/finding-detail.js

@@ -1,5 +1,5 @@
 import { findingTitle, reportEntries, revalidateKindOf } from '@preventive/report'
-import { managedTeamRevalidationConflicted } from './team-app.js'
+import { managedTeamAppRows, managedTeamLens, managedTeamRevalidationConflicted } from './team-app.js'
 import { liteName } from './lite-name.js'
 
 // A finding's detail: what its popup, the views besides the board and an
@@ -8,7 +8,8 @@ import { liteName } from './lite-name.js'
 // and an export tell (write-md-finding.js PLAIN_FIELDS, CODE_FIELDS, but for
 // `priority`, which the board sorts and filters by), and the run meta its
 // card's run line and a report's header read (its `model` and `type`, which
-// the board's filters read, stay). A team's
+// the board's filters read, stay), and the link the report gave its location
+// (`location`), which its card does not draw. A team's
 // reports are first sent without it (server-managed/team-reports.ts), the
 // board drawn from them, and their findings filled in from the whole reports
 // (ui/view/managed-details.js).
@@ -16,7 +17,7 @@ export const FINDING_DETAIL_FIELDS = Object.freeze([
   'description', 'evidence', 'impact', 'reproduction', 'recommendation', 'confidenceReason', 'revalidateVerdict', 'revalidateRecommendation',
   'fileHash', 'exportName', 'methodName',
   'severityReason', 'commitHash', 'auditedCommit', 'detectedAt', 'committedAt', 'dateCreated', 'status', 'branch', 'pocStatus', 'parent', 'slug', 'reportPath',
-  'category', 'discoveredIn', 'effort', 'exportsMode',
+  'category', 'discoveredIn', 'effort', 'exportsMode', 'location',
 ])
 const DETAIL = new Set(FINDING_DETAIL_FIELDS)
 // A finding without its detail. One without a title of its own is named by its
@@ -37,14 +38,20 @@ const isPass = finding => revalidateKindOf(finding) === 'revalidation'
 // App mode shows of an entry holding the revalidation pass's row that row
 // alone (ui/view/group.js foldedTabs): with `fold`, such an entry is sent as
 // the pass's rows, the rows beneath them left for the whole reports
-// (ui/view/managed-details.js).
-export function liteReportData(data, { fold = false } = {}) {
+// (ui/view/managed-details.js). With `shown`, the IDs of the findings one
+// whose App view locks Confirmed shows (common/workspace-app.js
+// workspaceAppRows), those alone are sent.
+export function liteReportData(data, { fold = false, shown = null } = {}) {
   const key = Array.isArray(data?.findings) ? 'findings' : Array.isArray(data?.groups) ? 'groups' : null
   if (!key) return data
+  if (shown) {
+    const kept = entry => (Array.isArray(entry) ? entry : [entry]).filter(finding => shown.has(finding?.id))
+    return { ...data, [key]: data[key].map(kept).filter(entry => entry.length > 0).map(entry => entry.map(liteFinding)) }
+  }
   const entries = data[key].map(entry => {
     if (!Array.isArray(entry)) return liteFinding(entry)
-    const shown = fold && entry.length > 1 && entry.some(isPass) ? entry.filter(isPass) : entry
-    return shown.map(liteFinding)
+    const folded = fold && entry.length > 1 && entry.some(isPass) ? entry.filter(isPass) : entry
+    return folded.map(liteFinding)
   })
   return { ...data, [key]: entries }
 }
@@ -52,12 +59,17 @@ export function liteReportData(data, { fold = false } = {}) {
 const rows = data => (reportEntries(data) ?? []).flat().length
 
 // A team's reports as its board is first sent them (server-managed/team-reports.ts),
-// each `liteReportData`, folded where nothing in the workspace contradicts the
-// revalidation pass, which opens a view of it in App mode
-// (ui/view/render.js configureReportRevalidation); `folded` where that left
-// rows out.
+// each `liteReportData`: where the workspace's App view locks Confirmed, only
+// the rows that view shows (`folded: 'app'`); else, where nothing in it
+// contradicts the revalidation pass, which opens a view of it in App mode
+// (ui/view/render.js configureReportRevalidation), its entries folded under
+// their App rows (`folded: 'rows'`). Folded, the `lens` the rows left out
+// tell (team-app.js managedTeamLens).
 export function liteWorkspace(reports, links) {
-  const fold = !managedTeamRevalidationConflicted(Object.assign(reports.map(({ filename, data }) => ({ filename, data })), { links }))
-  const lite = reports.map(report => ({ ...report, data: liteReportData(report.data, { fold }) }))
-  return { reports: lite, folded: fold && lite.some((report, index) => rows(report.data) < rows(reports[index].data)) }
+  const view = Object.assign(reports.map(({ filename, data }) => ({ filename, data })), { links })
+  const shown = managedTeamAppRows(view)
+  const fold = shown !== null || !managedTeamRevalidationConflicted(view)
+  const lite = reports.map(report => ({ ...report, data: liteReportData(report.data, { fold, shown }) }))
+  if (!fold || !lite.some((report, index) => rows(report.data) < rows(reports[index].data))) return { reports: lite, folded: false, lens: null }
+  return { reports: lite, folded: shown ? 'app' : 'rows', lens: managedTeamLens(view) }
 }

package/common/managed/team-app.d.ts

@@ -4,3 +4,5 @@ export type TeamAppMetadata = { appMode: true; appFindings: number } | { appMode
 export function managedTeamAppMetadata(workspace: readonly { filename: string; data: unknown }[] & { links?: readonly (readonly string[])[] },
   options?: { countFindings?: boolean }): TeamAppMetadata
 export function managedTeamRevalidationConflicted(workspace: readonly { filename: string; data: unknown }[] & { links?: readonly (readonly string[])[] }): boolean
+export function managedTeamAppRows(workspace: readonly { filename: string; data: unknown }[] & { links?: readonly (readonly string[])[] }): Set<string> | null
+export function managedTeamLens(workspace: readonly { filename: string; data: unknown }[] & { links?: readonly (readonly string[])[] }): { drop: boolean; detail: boolean; upstream: boolean }

package/common/managed/team-app.js

@@ -1,7 +1,8 @@
-import { inheritReportMeta, isAppFinding, reportEntries } from '@preventive/report'
+import { inheritReportMeta, isAppFinding, reportEntries, revalidateKindOf } from '@preventive/report'
 import { collectDuplicates } from '../../client/linked-findings.js'
+import { dependencyDirectory, isDependencyFile } from '../../client/dependency-paths.js'
 import { hasRevalidateStamp } from '../finding-filters.js'
-import { workspaceAppMetadata } from '../workspace-app.js'
+import { workspaceAppMetadata, workspaceAppRows } from '../workspace-app.js'
 import { mergeReportGroups } from '../workspace-groups.js'
 
 // The same classification as local workspaces, using only the complete,
@@ -22,6 +23,34 @@ export function managedTeamRevalidationConflicted(workspace) {
   return mergeReportGroups(viewReports(workspace).reports).conflicts.size > 0
 }
 
+// The IDs of the findings the workspace's basic App view can show
+// (common/workspace-app.js workspaceAppRows), or null.
+export function managedTeamAppRows(workspace) {
+  const { reports, duplicates } = viewReports(workspace)
+  return workspaceAppRows(reports, id => [...duplicates.get(id) ?? []])
+}
+
+const RULED_OUT = new Set(['refuted', 'unreachable'])
+
+// What a view of the whole workspace offers beside the App view
+// (ui/view/render.js), told by all its rows: whether the revalidation layer
+// can come off (`drop`), whether its detail stop has rows to unfold
+// (`detail`), and whether an upstream lens has ground (`upstream`).
+export function managedTeamLens(workspace) {
+  const { reports } = viewReports(workspace)
+  const rows = reports.flatMap(report => report.groups.flat())
+  const directory = dependencyDirectory(reports)
+  const detail = mergeReportGroups(reports).groups.some(group => {
+    const kinds = group.map(revalidateKindOf)
+    return kinds.includes('partial') || kinds.includes('revalidation') && kinds.some(kind => kind !== 'revalidation' && !RULED_OUT.has(kind))
+  })
+  return {
+    drop: rows.some(hasRevalidateStamp),
+    detail,
+    upstream: rows.some(f => f.isUpstream === true || f.isApp === false && !('isUpstream' in f) && isDependencyFile(f.file, directory)),
+  }
+}
+
 // The workspace's reports as a view holds them (ui/view/ingest.js), with the
 // duplicates its links name.
 function viewReports(workspace) {
@@ -41,7 +70,7 @@ function viewReports(workspace) {
       finding._sourcePass = judged.has(finding._source)
       return finding
     }))
-    reports.push({ fileName: filename, groups })
+    reports.push({ fileName: filename, groups, treeDependencies: data.treeDependencies ?? null })
   }
   return { reports, duplicates }
 }

package/common/workspace-app.js

@@ -1,5 +1,5 @@
 import { revalidateKindOf } from '@preventive/report'
-import { canLockConfirmed } from './finding-filters.js'
+import { activeRevalidateKinds, canLockConfirmed } from './finding-filters.js'
 import { mergeReportGroups } from './workspace-groups.js'
 import { mergeLinkedWorkspaceGroups } from './linked-workspace-groups.js'
 
@@ -27,13 +27,33 @@ function onlyUnjudgedImports(groups) {
 // `countFindings` has a workspace that is not App count its rows too, after
 // the same merging, for a caller that shows it collapsed (managed teams).
 export function workspaceAppMetadata(reports, duplicatesOf = () => [], { countFindings = false } = {}) {
-  const { groups, conflicts } = mergeReportGroups(reports, { hideRuledOut: true })
-  const linked = mergeLinkedWorkspaceGroups(groups, duplicatesOf, appTabs)
-  const notApp = countFindings ? { appMode: false, findings: linked.length } : { appMode: false }
-  if (conflicts.size > 0) return notApp
-  if (!onlyUnjudgedImports(linked) && !canLockConfirmed(linked, { tabs: appTabs, kindOf: revalidateKindOf, severityMode: 'corrected' })) return notApp
+  const { linked, app } = appView(reports, duplicatesOf)
+  if (!app) return countFindings ? { appMode: false, findings: linked.length } : { appMode: false }
   return {
     appMode: true,
     appFindings: linked.filter((group) => appTabs(group).some((f) => f.isApp)).length,
   }
 }
+
+// The IDs of the findings a workspace's basic App view can show: of each row
+// its locked Confirmed shows (ui/view/filters.js filterRevalidateKind), the
+// App tabs, the rest folded under them; none the pass ruled out. Null where it
+// has no such view, or one with no outcome to lock, which shows every row.
+export function workspaceAppRows(reports, duplicatesOf = () => []) {
+  const { linked, app } = appView(reports, duplicatesOf)
+  if (!app || onlyUnjudgedImports(linked)) return null
+  const kinds = activeRevalidateKinds('confirmed', '')
+  const confirmed = (f) => kinds.includes(revalidateKindOf(f) || (f._source && !f._sourcePass ? 'revalidation' : ''))
+  const ids = new Set()
+  for (const group of linked) if (group.some(confirmed)) for (const f of appTabs(group)) ids.add(f.id)
+  return ids
+}
+
+// A workspace's rows as its basic App view merges them, and whether it has one.
+function appView(reports, duplicatesOf) {
+  const { groups, conflicts } = mergeReportGroups(reports, { hideRuledOut: true })
+  const linked = mergeLinkedWorkspaceGroups(groups, duplicatesOf, appTabs)
+  const app = conflicts.size === 0
+    && (onlyUnjudgedImports(linked) || canLockConfirmed(linked, { tabs: appTabs, kindOf: revalidateKindOf, severityMode: 'corrected' }))
+  return { linked, app }
+}