@preventive/triage 1.0.0-alpha.44 → 1.0.0-alpha.46

package/common/managed/routes.js

@@ -28,6 +28,13 @@ export const MANAGED_PAGES = Object.freeze({
   'manage-history': '/manage/history',
 })
 
+// A team's lists, each at /team/<slug>/<what it lists>; its dependencies'
+// sub-tabs past the first at /team/<slug>/dependencies/<tab>.
+const WORKSPACE_CONTENT_VIEWS = new Set(['workspace-reports', 'workspace-bundles', 'workspace-repositories', 'workspace-dependencies'])
+export const DEPENDENCY_TABS = new Set(['pulls', 'versions', 'branch', 'reviews'])
+// A route's `dependencyTab` field, where it names one.
+const dependencyTabField = route => route.view === 'workspace-dependencies' && route.dependencyTab != null ? { dependencyTab: route.dependencyTab } : {}
+
 // Dot-only path components are normalised away by URL parsers, even escaped.
 function findingPath(id) {
   if (!isLinkableFindingId(id) || id === '.' || id === '..') return null
@@ -38,9 +45,13 @@ export function managedRoutePath(route) {
   if (!route) return null
   if (route.view === 'home') return '/'
   if (route.view === 'reviews') return '/my/reviews'
+  if (route.view === 'profile') return '/my/profile'
   if (route.view === 'npm') return npmPackagePath(route)
-  if (route.view === 'workspace-reports' || route.view === 'workspace-bundles') {
-    return /^[A-Za-z0-9_-]+$/u.test(route.teamSlug ?? '') ? `/team/${route.teamSlug}/${route.view.slice(10)}` : null
+  if (route.view === 'repository-code') return repositoryCodePath(route)
+  if (WORKSPACE_CONTENT_VIEWS.has(route.view)) {
+    const tab = dependencyTabField(route).dependencyTab ?? 'pulls'
+    if (!/^[A-Za-z0-9_-]+$/u.test(route.teamSlug ?? '') || !DEPENDENCY_TABS.has(tab)) return null
+    return `/team/${route.teamSlug}/${route.view.slice(10)}${tab === 'pulls' ? '' : `/${tab}`}`
   }
   if (route.view === 'bundles') {
     if (!/^[A-Za-z0-9_-]+$/u.test(route.bundleSlug ?? '')
@@ -128,6 +139,66 @@ function parseNpmRoute(path, hash) {
   return !match[5] && /^[1-9]\d*$/u.test(match[4]) && Number.isSafeInteger(file) ? { ...route, file, ...codeLines(hash) } : null
 }
 
+// The code viewer: a directory of a repository at a commit, on its Code,
+// Search, Treemap, Compare, Commits, Issues, Pull requests, Agents, Pulse
+// or Replay tab, `/repo/<repo id>/<commit>[/<tab>…][?path=<directory>]`,
+// the repository's root where it names no directory. Code, the tab a bare
+// link opens, names its file by number and its lines in the fragment, as a
+// bundle's Code does: `/code/<file>#L4`. Compare names the commit compared
+// with, then its mode past the Overview, as an npm version's does:
+// `/compare/<commit>/code`. Without a commit,
+// `/repo/<repo id>[?path=<directory>]`, it opens on the default
+// branch's head, or on the revision a route held in memory names (`ref`),
+// and its route then names the commit it opened. Links from before it moved
+// name it under `/manage/code/`, and open the same.
+export const REPOSITORY_CODE_TABS = new Set(['code', 'search', 'treemap', 'compare', 'commits', 'issues', 'pulls', 'agents', 'pulse', 'replay'])
+// The tabs reading none of the directory's files, which a directory at a
+// commit shows alone.
+export const REPOSITORY_FILELESS_TABS = new Set(['commits', 'issues', 'pulls', 'agents', 'pulse', 'replay'])
+const COMMIT = /^[a-f\d]{40}$/u
+const MAX_DIRECTORY = 500
+const isRepoId = value => Number.isSafeInteger(value) && value > 0
+
+// A directory as the server takes one (server-managed/repo-path.ts), in its
+// canonical form: `''` the root, else names with no empty, `.` or `..` one
+// among them, nor control characters, backslashes or spaces around one.
+export function isRepositoryDirectory(path) {
+  return typeof path === 'string' && (path === '' || path.length <= MAX_DIRECTORY && !/[\p{Cc}\\]/u.test(path)
+    && path.split('/').every(part => part !== '' && part !== '.' && part !== '..' && part === part.trim()))
+}
+
+function repositoryCodePath(route) {
+  const tab = route.bundleTab ?? 'code'
+  const path = route.path ?? ''
+  if (!isRepoId(route.repoId) || (route.commit != null && !COMMIT.test(route.commit)) || !isRepositoryDirectory(path) || !REPOSITORY_CODE_TABS.has(tab)
+      || (route.compareCommit != null && !COMMIT.test(route.compareCommit))) return null
+  const directory = path ? `?path=${path.split('/').map(encodeURIComponent).join('/')}` : ''
+  if (route.commit == null) return `/repo/${route.repoId}${directory}`
+  const file = tab === 'code' && isLineNumber(route.file) ? `/code/${route.file}` : tab === 'code' ? '' : `/${tab}`
+  const compare = tab === 'compare' && route.compareCommit != null ? `/${route.compareCommit}${compareModeSuffix(route.compareMode)}` : ''
+  const lines = tab === 'code' && isLineNumber(route.file) && isLineNumber(route.line)
+    ? `#L${route.line}${isLineNumber(route.endLine) && route.endLine > route.line ? `-L${route.endLine}` : ''}` : ''
+  return `/repo/${route.repoId}/${route.commit}${file}${compare}${directory}${lines}`
+}
+
+function parseRepositoryCodeRoute(url) {
+  const match = /^\/(?:repo|manage\/code)\/([1-9]\d*)(?:\/([a-f\d]{40})(?:\/(code|search|treemap|compare|commits|history|issues|pulls|agents|pulse|replay)(?:\/([^/]+)(?:\/([a-z]+))?)?)?)?$/u
+    .exec(url.pathname.replace(/\/$/u, ''))
+  if (!match) return undefined
+  const repoId = Number(match[1])
+  const path = url.searchParams.get('path') ?? ''
+  // Commits' tab was History's, `/history`, which links still name.
+  const tab = match[3] === 'history' ? 'commits' : match[3] ?? 'code'
+  if (!isRepoId(repoId) || !isRepositoryDirectory(path)) return null
+  const route = { view: 'repository-code', repoId, commit: match[2] ?? null, path, bundleTab: tab }
+  if (match[4] == null) return route
+  if (tab === 'compare') {
+    return COMMIT.test(match[4]) && (match[5] == null || COMPARE_MODES.has(match[5])) ? { ...route, compareCommit: match[4], ...compareModeField(match[5]) } : null
+  }
+  const file = Number(match[4])
+  return tab === 'code' && match[5] == null && /^[1-9]\d*$/u.test(match[4]) && Number.isSafeInteger(file) ? { ...route, file, ...codeLines(url.hash) } : null
+}
+
 function isLineNumber(value) {
   return Number.isSafeInteger(value) && value > 0
 }
@@ -144,6 +215,12 @@ export function parseManagedRoute(url) {
   const path = url.pathname.replace(/\/$/u, '') || '/'
   if (path === '/' || path === '/index.html') return { view: 'home' }
   if (path === '/my/reviews') return { view: 'reviews' }
+  // Linking an account lands here, naming why GitHub's answer was refused,
+  // which the page shows once: the address it settles on drops it.
+  if (path === '/my/profile') {
+    const linkError = url.searchParams.get('link-error')
+    return { view: 'profile', ...(linkError && /^[a-z-]{1,64}$/u.test(linkError) ? { linkError } : {}) }
+  }
   const view = Object.keys(MANAGED_PAGES).find(key => MANAGED_PAGES[key] === path)
   if (view) {
     const createRepoId = Number(url.searchParams.get('createRepo'))
@@ -169,8 +246,12 @@ export function parseManagedRoute(url) {
   }
   const npm = parseNpmRoute(path, url.hash)
   if (npm !== undefined) return npm
-  const contentList = /^\/team\/([A-Za-z0-9_-]+)\/(reports|bundles)$/u.exec(path)
+  const code = parseRepositoryCodeRoute(url)
+  if (code !== undefined) return code
+  const contentList = /^\/team\/([A-Za-z0-9_-]+)\/(reports|bundles|repositories|dependencies)$/u.exec(path)
   if (contentList) return { view: `workspace-${contentList[2]}`, teamSlug: contentList[1] }
+  const dependencies = /^\/team\/([A-Za-z0-9_-]+)\/dependencies\/([a-z]+)$/u.exec(path)
+  if (dependencies) return DEPENDENCY_TABS.has(dependencies[2]) ? { view: 'workspace-dependencies', teamSlug: dependencies[1], dependencyTab: dependencies[2] } : null
   const match = /^\/team\/([^/]+)(?:\/report\/([^/]+))?(?:\/(files)|\/finding\/([^/]+))?$/u.exec(path)
   if (!match) return null
   try {
@@ -187,9 +268,9 @@ export function parseManagedRoute(url) {
 // URL tokens are exact server-assigned slugs. Application state and API calls
 // continue to use UUIDs; never guess IDs from suffixes or accept ID aliases.
 export function resolveManagedRoute(route, teams, adminBundles = []) {
-  if (route.view === 'workspace-reports' || route.view === 'workspace-bundles') {
+  if (WORKSPACE_CONTENT_VIEWS.has(route.view)) {
     const matches = teams.filter(team => team.slug === route.teamSlug)
-    return matches.length === 1 ? { view: route.view, teamId: matches[0].id } : null
+    return matches.length === 1 ? { view: route.view, teamId: matches[0].id, ...dependencyTabField(route) } : null
   }
   if (route.view === 'bundles') {
     const { teamSlug, bundleSlug, compareSlug, compareMode, ...rest } = route
@@ -220,9 +301,9 @@ export function resolveManagedRoute(route, teams, adminBundles = []) {
 }
 
 export function managedRouteForIds(route, teams, adminBundles = []) {
-  if (route.view === 'workspace-reports' || route.view === 'workspace-bundles') {
+  if (WORKSPACE_CONTENT_VIEWS.has(route.view)) {
     const team = teams.find(entry => entry.id === route.teamId)
-    const result = { view: route.view, teamSlug: team?.slug }
+    const result = { view: route.view, teamSlug: team?.slug, ...dependencyTabField(route) }
     return team?.slug && resolveManagedRoute(result, teams) ? result : null
   }
   if (route.view === 'bundles') {

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

@@ -1,2 +1,5 @@
-export type TeamAppMetadata = { appMode: true; appFindings: number } | { appMode: false }
-export function managedTeamAppMetadata(workspace: readonly { filename: string; data: unknown }[] & { links?: readonly (readonly string[])[] }): TeamAppMetadata
+// Set for a team that is not App: `findings`, its rows (with `countFindings`),
+// and `appReports`, set by the managed catalog: how many reports open in App mode alone.
+export type TeamAppMetadata = { appMode: true; appFindings: number } | { appMode: false; appReports?: number; findings?: number }
+export function managedTeamAppMetadata(workspace: readonly { filename: string; data: unknown }[] & { links?: readonly (readonly string[])[] },
+  options?: { countFindings?: boolean }): TeamAppMetadata

package/common/managed/team-app.js

@@ -8,7 +8,7 @@ import { workspaceAppMetadata } from '../workspace-app.js'
 // its `links`. The managed server classifies each team before sending its
 // catalog, so the sidebar opens a team collapsed to its App findings at once.
 // The server backfills finding IDs before building these envelopes.
-export function managedTeamAppMetadata(workspace) {
+export function managedTeamAppMetadata(workspace, options = {}) {
   const duplicates = new Map(), reports = []
   collectDuplicates(workspace.links ?? [], duplicates)
   for (const { filename, data } of workspace) {
@@ -27,5 +27,5 @@ export function managedTeamAppMetadata(workspace) {
     }))
     reports.push({ fileName: filename, groups })
   }
-  return workspaceAppMetadata(reports, id => [...duplicates.get(id) ?? []])
+  return workspaceAppMetadata(reports, id => [...duplicates.get(id) ?? []], options)
 }

package/common/server-info.ts

@@ -26,6 +26,9 @@ export interface ManagedSessionInfo {
   user: { id: string; login: string; name: string | null; role: string }
   csrfToken: string
   viewer?: { id: string; login: string; name: string | null }
+  // Where the user publishes dependency reviews to some team: an npm
+  // version's Review tab is theirs (server-managed/dependency-reviews.ts).
+  dependencyReview?: true
 }
 
 // The `server-info` frame payload (the `type` discriminant is added at the

package/common/workspace-app.js

@@ -24,11 +24,14 @@ function onlyUnjudgedImports(groups) {
 
 // Evaluate the entire workspace, independent of triage, filters, or the lens
 // left active by another report. Use the same merge and link rules as the view.
-export function workspaceAppMetadata(reports, duplicatesOf = () => []) {
+// `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 })
-  if (conflicts.size > 0) return { appMode: false }
   const linked = mergeLinkedWorkspaceGroups(groups, duplicatesOf, appTabs)
-  if (!onlyUnjudgedImports(linked) && !canLockConfirmed(linked, { tabs: appTabs, kindOf: revalidateKindOf, severityMode: 'corrected' })) return { appMode: false }
+  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
   return {
     appMode: true,
     appFindings: linked.filter((group) => appTabs(group).some((f) => f.isApp)).length,