mirror of
https://github.com/stablyai/orca.git
synced 2026-10-20 08:03:28 +00:00
* Add mobile diff review * Wrap mobile review notes prompt * Fix mobile review unreviewed navigation * Clear review completion when a refreshed diff invalidates a reviewed file mergeMobileDiffReviewState invalidates a file's reviewed flag when its diff identity changes, but left completedAt set — inconsistent with markUnreviewed. Drop completedAt on invalidation and add a regression test. Co-authored-by: Orca <help@stably.ai> --------- Co-authored-by: Jinwoo-H <jinwoo0825@gmail.com> Co-authored-by: Orca <help@stably.ai>
121 lines
3.5 KiB
TypeScript
121 lines
3.5 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import type { DiffComment, MobileDiffReviewState } from '../../../src/shared/types'
|
|
import type { MobileGitBranchChangeEntry } from '../source-control/mobile-branch-compare'
|
|
import type { MobileGitStatusEntry } from '../source-control/mobile-git-status'
|
|
import {
|
|
buildMobileDiffReviewQueue,
|
|
createMobileDiffReviewFileKey,
|
|
filterMobileDiffReviewQueue
|
|
} from './mobile-diff-review-queue'
|
|
|
|
const emptyReviewState: MobileDiffReviewState = { version: 1, files: {} }
|
|
|
|
function statusEntry(overrides: Partial<MobileGitStatusEntry>): MobileGitStatusEntry {
|
|
return {
|
|
path: 'src/app.ts',
|
|
status: 'modified',
|
|
area: 'unstaged',
|
|
...overrides
|
|
}
|
|
}
|
|
|
|
function branchEntry(overrides: Partial<MobileGitBranchChangeEntry>): MobileGitBranchChangeEntry {
|
|
return {
|
|
path: 'src/branch.ts',
|
|
status: 'modified',
|
|
...overrides
|
|
}
|
|
}
|
|
|
|
function comment(overrides: Partial<DiffComment> & Pick<DiffComment, 'id'>): DiffComment {
|
|
const { id, ...rest } = overrides
|
|
return {
|
|
id,
|
|
worktreeId: 'wt-1',
|
|
filePath: 'src/app.ts',
|
|
source: 'diff',
|
|
lineNumber: 2,
|
|
body: 'note',
|
|
createdAt: 10,
|
|
side: 'modified',
|
|
...rest
|
|
}
|
|
}
|
|
|
|
describe('mobile diff review queue', () => {
|
|
it('builds unstaged, staged, and branch entries in review order', () => {
|
|
const queue = buildMobileDiffReviewQueue({
|
|
worktreeId: 'wt-1',
|
|
statusEntries: [
|
|
statusEntry({ path: 'z.ts', area: 'staged' }),
|
|
statusEntry({ path: 'a.ts', area: 'unstaged' })
|
|
],
|
|
branchEntries: [branchEntry({ path: 'b.ts' })],
|
|
branchHeadOid: 'head',
|
|
branchMergeBase: 'base',
|
|
comments: [],
|
|
reviewState: emptyReviewState
|
|
})
|
|
|
|
expect(queue.map((item) => `${item.scope}:${item.filePath}`)).toEqual([
|
|
'unstaged:a.ts',
|
|
'staged:z.ts',
|
|
'branch:b.ts'
|
|
])
|
|
})
|
|
|
|
it('uses stable keys for renamed files', () => {
|
|
expect(createMobileDiffReviewFileKey('branch', 'branch', 'new.ts', 'old.ts')).toBe(
|
|
'branch\0branch\0old.ts\0new.ts'
|
|
)
|
|
})
|
|
|
|
it('counts unsent and stale notes for matching review items', () => {
|
|
const queue = buildMobileDiffReviewQueue({
|
|
worktreeId: 'wt-1',
|
|
statusEntries: [statusEntry({ path: 'src/app.ts', area: 'unstaged' })],
|
|
branchEntries: [],
|
|
comments: [
|
|
comment({ id: 'a', scope: 'unstaged', diffIdentity: 'stale' }),
|
|
comment({ id: 'b', scope: 'unstaged', sentAt: 20 })
|
|
],
|
|
reviewState: emptyReviewState
|
|
})
|
|
|
|
expect(queue[0]).toMatchObject({ noteCount: 2, unsentNoteCount: 1, staleNoteCount: 1 })
|
|
})
|
|
|
|
it('filters unreviewed files and noted files', () => {
|
|
const reviewState: MobileDiffReviewState = {
|
|
version: 1,
|
|
files: {
|
|
[createMobileDiffReviewFileKey('unstaged', 'unstaged', 'a.ts')]: {
|
|
key: createMobileDiffReviewFileKey('unstaged', 'unstaged', 'a.ts'),
|
|
filePath: 'a.ts',
|
|
scope: 'unstaged',
|
|
reviewedAt: 11,
|
|
reviewDiffIdentity: 'wrong'
|
|
}
|
|
}
|
|
}
|
|
const queue = buildMobileDiffReviewQueue({
|
|
worktreeId: 'wt-1',
|
|
statusEntries: [
|
|
statusEntry({ path: 'a.ts', area: 'unstaged' }),
|
|
statusEntry({ path: 'b.ts', area: 'unstaged' })
|
|
],
|
|
branchEntries: [],
|
|
comments: [comment({ id: 'a', filePath: 'b.ts' })],
|
|
reviewState
|
|
})
|
|
|
|
expect(filterMobileDiffReviewQueue(queue, 'unreviewed').map((item) => item.filePath)).toEqual([
|
|
'a.ts',
|
|
'b.ts'
|
|
])
|
|
expect(filterMobileDiffReviewQueue(queue, 'notes').map((item) => item.filePath)).toEqual([
|
|
'b.ts'
|
|
])
|
|
})
|
|
})
|