mirror of
https://github.com/stablyai/orca.git
synced 2026-11-01 01:27:35 +00:00
* fix(mobile): list Source Control changes with desktop's sections, sort and row rules Conflicts get their own section in the user's group order, submodule rows lose stage and discard like desktop, paths sort with the shared collator, and review notes go out as desktop formats them. * fix(mobile): read the group order the host now publishes and keep submodule rows read-only The host's paired settings projection now carries sourceControlGroupOrder, the normalized status projection keeps submodule metadata, and conflict rows reuse the shared conflict-kind labels. * refactor(mobile): share Source Control grouping and row rules with desktop Desktop and mobile group rows through one shared helper, mobile's unstage button follows desktop's rule, and the group order resets when the host changes.
147 lines
3.6 KiB
TypeScript
147 lines
3.6 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import type { DiffComment } from '../../../src/shared/diff-comment-types'
|
|
import {
|
|
addMobileDiffComment,
|
|
normalizeMobileDiffComments,
|
|
removeDeliveredMobileDiffComments,
|
|
removeMobileDiffComments
|
|
} from './mobile-diff-comments'
|
|
|
|
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: 4,
|
|
body: 'check this',
|
|
createdAt: 100,
|
|
side: 'modified',
|
|
...rest
|
|
}
|
|
}
|
|
|
|
describe('mobile diff comments', () => {
|
|
it('normalizes persisted worktree metadata for mobile rendering', () => {
|
|
expect(
|
|
normalizeMobileDiffComments(
|
|
[
|
|
comment({ id: 'a' }),
|
|
{ id: 'missing-body', filePath: 'src/app.ts', lineNumber: 1, body: ' ' },
|
|
null
|
|
],
|
|
'wt-1'
|
|
)
|
|
).toEqual([comment({ id: 'a' })])
|
|
})
|
|
|
|
it('creates trimmed modified-side comments', () => {
|
|
const result = addMobileDiffComment([], {
|
|
id: 'mobile-1',
|
|
worktreeId: 'wt-1',
|
|
filePath: 'src/app.ts',
|
|
lineNumber: 8,
|
|
body: ' Needs tests ',
|
|
createdAt: 200
|
|
})
|
|
|
|
expect(result.comment).toMatchObject({
|
|
id: 'mobile-1',
|
|
worktreeId: 'wt-1',
|
|
filePath: 'src/app.ts',
|
|
source: 'diff',
|
|
lineNumber: 8,
|
|
body: 'Needs tests',
|
|
side: 'modified'
|
|
})
|
|
expect(result.comments).toHaveLength(1)
|
|
})
|
|
|
|
it('creates file-level scoped comments', () => {
|
|
const result = addMobileDiffComment([], {
|
|
id: 'mobile-1',
|
|
worktreeId: 'wt-1',
|
|
filePath: 'src/app.ts',
|
|
oldPath: 'src/old-app.ts',
|
|
lineNumber: 0,
|
|
body: ' File note ',
|
|
createdAt: 200,
|
|
scope: 'branch',
|
|
diffIdentity: 'd1'
|
|
})
|
|
|
|
expect(result.comment).toMatchObject({
|
|
lineNumber: 0,
|
|
body: 'File note',
|
|
scope: 'branch',
|
|
oldPath: 'src/old-app.ts',
|
|
diffIdentity: 'd1'
|
|
})
|
|
})
|
|
|
|
it('rejects blank comment bodies', () => {
|
|
const existing = [comment({ id: 'a' })]
|
|
const result = addMobileDiffComment(existing, {
|
|
id: 'mobile-1',
|
|
worktreeId: 'wt-1',
|
|
filePath: 'src/app.ts',
|
|
lineNumber: 8,
|
|
body: ' ',
|
|
createdAt: 200
|
|
})
|
|
|
|
expect(result.comment).toBeNull()
|
|
expect(result.comments).toEqual(existing)
|
|
})
|
|
|
|
it('removes delivered comments by snapshot id without touching new notes', () => {
|
|
expect(
|
|
removeMobileDiffComments(
|
|
[comment({ id: 'a' }), comment({ id: 'b' })],
|
|
new Set(['a', 'missing'])
|
|
)
|
|
).toEqual([comment({ id: 'b' })])
|
|
})
|
|
|
|
it('keeps a changed note when clearing an older delivered snapshot', () => {
|
|
const delivered = comment({ id: 'a', body: 'old note' })
|
|
|
|
expect(
|
|
removeDeliveredMobileDiffComments(
|
|
[comment({ id: 'a', body: 'new note' }), comment({ id: 'b' })],
|
|
[delivered]
|
|
)
|
|
).toEqual([comment({ id: 'a', body: 'new note' }), comment({ id: 'b' })])
|
|
})
|
|
|
|
it('keeps review metadata while normalizing persisted notes', () => {
|
|
expect(
|
|
normalizeMobileDiffComments(
|
|
[
|
|
comment({
|
|
id: 'a',
|
|
lineNumber: 0,
|
|
updatedAt: 200,
|
|
sentAt: 300,
|
|
scope: 'staged',
|
|
oldPath: 'src/old.ts',
|
|
diffIdentity: 'd1'
|
|
})
|
|
],
|
|
'wt-1'
|
|
)
|
|
).toEqual([
|
|
comment({
|
|
id: 'a',
|
|
lineNumber: 0,
|
|
updatedAt: 200,
|
|
sentAt: 300,
|
|
scope: 'staged',
|
|
oldPath: 'src/old.ts',
|
|
diffIdentity: 'd1'
|
|
})
|
|
])
|
|
})
|
|
})
|