@bevel-software/platform-core-frontend 0.4.0 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +5 -3
- package/src/core/CoreAppShell.tsx +195 -56
- package/src/core/__tests__/AppChrome.test.tsx +125 -0
- package/src/core/__tests__/ShellRoutes.test.tsx +130 -95
- package/src/core/__tests__/bootstrap.test.ts +63 -0
- package/src/core/bootstrap.ts +73 -0
- package/src/core/events.ts +12 -0
- package/src/core/registry.ts +58 -9
- package/src/index.css +100 -11
- package/src/index.ts +24 -23
- package/src/lib/utils.ts +114 -138
- package/src/modules/access/__tests__/ManageAccessDialog.placement.test.tsx +281 -0
- package/src/modules/access/__tests__/ManageAccessDialog.test.tsx +166 -1
- package/src/modules/access/api.ts +49 -0
- package/src/modules/access/components/ManageAccessDialog.tsx +786 -481
- package/src/modules/access/hooks/useFileAccess.ts +1 -1
- package/src/modules/admin/__tests__/AdminRolesPage.suggest.test.tsx +86 -0
- package/src/modules/admin/__tests__/UserAccountsPage.test.tsx +172 -156
- package/src/modules/admin/__tests__/admin.unread.test.tsx +61 -0
- package/src/modules/admin/components/AdminRolesPage.tsx +44 -38
- package/src/modules/admin/components/RolesCorruptedBanner.tsx +11 -10
- package/src/modules/admin/components/UserAccountsPage.tsx +361 -353
- package/src/modules/admin/state/admin.context.tsx +15 -6
- package/src/modules/auth/components/AccountPage.tsx +11 -11
- package/src/modules/auth/components/LoginScreen.tsx +12 -12
- package/src/modules/auth/services/sso.ts +47 -1
- package/src/modules/change-requests/__tests__/ChangeRequestDialog.test.tsx +277 -0
- package/src/modules/change-requests/__tests__/author.test.ts +48 -0
- package/src/modules/change-requests/__tests__/conflict.test.ts +73 -0
- package/src/modules/change-requests/__tests__/diff.test.ts +134 -0
- package/src/modules/change-requests/__tests__/propose.test.ts +93 -0
- package/src/modules/change-requests/__tests__/useFileOnBranch.test.tsx +72 -0
- package/src/modules/change-requests/change-requests.css +22 -0
- package/src/modules/change-requests/components/ChangeBox.tsx +277 -0
- package/src/modules/change-requests/components/ChangeRequestDialog.tsx +713 -0
- package/src/modules/change-requests/components/ConflictHelp.tsx +47 -0
- package/src/modules/change-requests/components/CrFileTree.tsx +398 -0
- package/src/modules/change-requests/components/FileChangeBoxes.tsx +168 -0
- package/src/modules/change-requests/hooks/useApplyChangeRequest.ts +236 -0
- package/src/modules/change-requests/hooks/useCrFileDiffs.ts +79 -0
- package/src/modules/change-requests/hooks/useFileOnBranch.ts +80 -0
- package/src/modules/change-requests/services/change-requests.api.ts +45 -0
- package/src/modules/change-requests/services/propose.api.ts +162 -0
- package/src/modules/change-requests/utils/author.ts +47 -0
- package/src/modules/change-requests/utils/conflict.ts +38 -0
- package/src/modules/change-requests/utils/diff.ts +80 -0
- package/src/modules/git/__tests__/BranchSwitcher.test.tsx +27 -18
- package/src/modules/git/__tests__/FileHistoryPanel.test.tsx +36 -83
- package/src/modules/git/__tests__/PullNeededBanner.test.tsx +5 -5
- package/src/modules/git/__tests__/PullRequestsForMe.test.tsx +147 -0
- package/src/modules/git/__tests__/useAutoPullUpdates.test.tsx +2 -8
- package/src/modules/git/components/BranchSwitcher.tsx +68 -31
- package/src/modules/git/components/DiffView.tsx +4 -4
- package/src/modules/git/components/FileComparisonPanel.tsx +20 -20
- package/src/modules/git/components/FileHistoryPanel.tsx +71 -107
- package/src/modules/git/components/PullNeededBanner.tsx +6 -13
- package/src/modules/git/components/PullRequestsForMe.tsx +71 -36
- package/src/modules/git/components/UnifiedDiffView.tsx +4 -4
- package/src/modules/git/hooks/__tests__/useGitState.deleteBranch.test.tsx +2 -2
- package/src/modules/git/hooks/useGitState.ts +15 -14
- package/src/modules/git/services/__tests__/error-messages.test.ts +4 -4
- package/src/modules/git/services/error-messages.ts +7 -7
- package/src/modules/git/services/git.api.ts +17 -11
- package/src/modules/git/services/pr-prompts.ts +2 -2
- package/src/modules/git/state/git.context.ts +10 -1
- package/src/modules/layout/__tests__/SidebarFrameResponsive.test.tsx +224 -0
- package/src/modules/layout/__tests__/SidebarToggle.test.tsx +242 -0
- package/src/modules/layout/__tests__/breakpoints.test.ts +56 -0
- package/src/modules/layout/breakpoints.ts +6 -0
- package/src/modules/layout/components/AppLayout.tsx +17 -5
- package/src/modules/layout/components/DemoBanner.tsx +10 -1
- package/src/modules/layout/components/MaintenanceOverlay.tsx +104 -104
- package/src/modules/layout/components/MobileChatLayout.tsx +31 -26
- package/src/modules/layout/components/ResizableThreePaneLayout.tsx +59 -24
- package/src/modules/layout/components/SidebarFrame.tsx +317 -0
- package/src/modules/layout/components/SidebarToggle.tsx +86 -0
- package/src/modules/layout/components/SlideOverlay.tsx +1 -1
- package/src/modules/layout/components/__tests__/MobileChatLayout.test.tsx +40 -2
- package/src/modules/layout/components/__tests__/ResizableThreePaneLayout.test.tsx +19 -3
- package/src/modules/layout/state/sidebar.ts +200 -0
- package/src/modules/library/__tests__/AddToGroupDialog.test.tsx +313 -0
- package/src/modules/library/__tests__/ChangeRequestDock.test.tsx +84 -0
- package/src/modules/library/__tests__/GroupJoinRequests.test.tsx +178 -0
- package/src/modules/library/__tests__/GroupPage.test.tsx +479 -0
- package/src/modules/library/__tests__/GroupsIndexPage.test.tsx +283 -0
- package/src/modules/library/__tests__/GroupsSidebar.contextmenu.test.tsx +175 -0
- package/src/modules/library/__tests__/GroupsSidebar.locked.test.tsx +96 -0
- package/src/modules/library/__tests__/GroupsSidebar.test.tsx +142 -0
- package/src/modules/library/__tests__/GroupsSidebarMenu.test.tsx +142 -0
- package/src/modules/library/__tests__/LibraryCard.test.tsx +149 -0
- package/src/modules/library/__tests__/LibraryRoutes.test.tsx +378 -0
- package/src/modules/library/__tests__/LibrarySidebarMenu.test.tsx +347 -0
- package/src/modules/library/__tests__/LockedGroupView.test.tsx +203 -0
- package/src/modules/library/__tests__/NewGroupDialog.test.tsx +114 -0
- package/src/modules/library/__tests__/PersonalAddDialog.test.tsx +177 -0
- package/src/modules/library/__tests__/SkillPage.test.tsx +1063 -0
- package/src/modules/library/__tests__/ToolConnectionSection.test.tsx +259 -0
- package/src/modules/library/__tests__/ToolLogo.test.tsx +63 -0
- package/src/modules/library/__tests__/ToolPage.test.tsx +315 -0
- package/src/modules/library/__tests__/ToolSharePanel.test.tsx +36 -0
- package/src/modules/library/__tests__/ToolVarRow.test.tsx +260 -0
- package/src/modules/library/__tests__/WorkspaceItemRoute.test.tsx +197 -0
- package/src/modules/library/__tests__/auth-harness.tsx +37 -0
- package/src/modules/library/__tests__/oauth-fragment.test.ts +48 -0
- package/src/modules/library/__tests__/status.test.ts +210 -117
- package/src/modules/library/__tests__/useSkillDetail.test.tsx +102 -0
- package/src/modules/library/__tests__/useToolPage.test.tsx +146 -0
- package/src/modules/library/components/AccessRequestsBanner.tsx +101 -0
- package/src/modules/library/components/AddToGroupDialog.tsx +115 -0
- package/src/modules/library/components/ChangeRequestDock.tsx +71 -47
- package/src/modules/library/components/DeleteGroupDialog.tsx +87 -0
- package/src/modules/library/components/GroupIndexRow.tsx +63 -0
- package/src/modules/library/components/GroupJoinRequests.tsx +56 -0
- package/src/modules/library/components/GroupPage.tsx +373 -0
- package/src/modules/library/components/GroupsIndexPage.tsx +222 -0
- package/src/modules/library/components/GroupsSidebar.tsx +338 -0
- package/src/modules/library/components/GroupsSidebarMenu.tsx +160 -0
- package/src/modules/library/components/LibraryCard.tsx +153 -132
- package/src/modules/library/components/LibraryLayout.tsx +344 -0
- package/src/modules/library/components/LibraryPage.tsx +138 -254
- package/src/modules/library/components/LockGlyph.tsx +31 -0
- package/src/modules/library/components/LockedGroupView.tsx +159 -0
- package/src/modules/library/components/ManagedGroupRequests.tsx +70 -0
- package/src/modules/library/components/NewGroupDialog.tsx +112 -0
- package/src/modules/library/components/NewSkillPanel.tsx +151 -0
- package/src/modules/library/components/PageActions.tsx +156 -0
- package/src/modules/library/components/PendingSkillReview.tsx +63 -0
- package/src/modules/library/components/PersonalAddDialog.tsx +88 -0
- package/src/modules/library/components/PersonalGroupPage.tsx +125 -0
- package/src/modules/library/components/StatusDot.tsx +25 -0
- package/src/modules/library/components/ToolLogo.tsx +171 -0
- package/src/modules/library/components/group-page-parts.tsx +419 -0
- package/src/modules/library/components/skill-page/SkillFileEditor.tsx +134 -0
- package/src/modules/library/components/skill-page/SkillFilePane.tsx +117 -0
- package/src/modules/library/components/skill-page/SkillFileTabs.tsx +112 -0
- package/src/modules/library/components/skill-page/SkillPage.tsx +673 -0
- package/src/modules/library/components/skill-page/tab-ids.ts +33 -0
- package/src/modules/library/components/tool-page/ToolConnectionSection.tsx +175 -0
- package/src/modules/library/components/tool-page/ToolPage.tsx +228 -0
- package/src/modules/library/components/tool-page/ToolSharePanel.tsx +45 -0
- package/src/modules/library/components/tool-page/ToolVarRow.tsx +289 -0
- package/src/modules/library/hooks/useJoinRequests.ts +114 -0
- package/src/modules/library/hooks/useLibraryData.ts +134 -119
- package/src/modules/library/hooks/useSkillDetail.ts +119 -74
- package/src/modules/library/hooks/useToolPage.ts +145 -0
- package/src/modules/library/library.css +108 -320
- package/src/modules/library/routes/LibraryRoutes.tsx +134 -0
- package/src/modules/library/routes/WorkspaceItemRoute.tsx +74 -0
- package/src/modules/library/routes/library-paths.ts +191 -0
- package/src/modules/library/services/groups.api.ts +189 -0
- package/src/modules/library/services/library.api.ts +291 -164
- package/src/modules/library/services/tools.api.ts +60 -0
- package/src/modules/library/state/library-context.ts +22 -0
- package/src/modules/library/state/library-data.tsx +223 -0
- package/src/modules/library/state/toast.context.ts +32 -0
- package/src/modules/library/state/toast.tsx +84 -42
- package/src/modules/library/utils/clipboard.ts +33 -0
- package/src/modules/library/utils/group-summary.ts +68 -0
- package/src/modules/library/utils/names.ts +30 -0
- package/src/modules/library/utils/navigate-external.ts +15 -0
- package/src/modules/library/utils/oauth-fragment.ts +32 -0
- package/src/modules/library/utils/personal-group.ts +36 -0
- package/src/modules/library/utils/status.ts +199 -116
- package/src/modules/library/utils/toast-duration.ts +16 -0
- package/src/modules/onboarding/__tests__/onboarding.test.tsx +533 -0
- package/src/modules/onboarding/agent-clients.ts +48 -0
- package/src/modules/onboarding/components/ConnectAgentPill.tsx +133 -0
- package/src/modules/onboarding/components/RootLanding.tsx +54 -0
- package/src/modules/onboarding/components/WelcomePage.tsx +364 -0
- package/src/modules/onboarding/paths.ts +9 -0
- package/src/modules/onboarding/state/onboarding.ts +191 -0
- package/src/modules/pr/components/OpenChangeRequestDialog.tsx +10 -10
- package/src/modules/pr/services/pr-approvals.api.ts +19 -0
- package/src/modules/pr/services/pr-cancel.api.ts +11 -0
- package/src/modules/review/components/BinaryChangePlaceholder.tsx +3 -3
- package/src/modules/review/components/DiffViewer.tsx +4 -4
- package/src/modules/review/components/MarkdownDiffViewer.tsx +84 -26
- package/src/modules/review/components/ReviewFileRow.tsx +10 -10
- package/src/modules/review/components/ReviewPanel.tsx +49 -17
- package/src/modules/review/components/ReviewPanelSurface.tsx +1 -1
- package/src/modules/review/components/__tests__/MarkdownDiffViewer.test.tsx +122 -0
- package/src/modules/review/hooks/__tests__/useReviewState.test.ts +1 -1
- package/src/modules/secrets-vault/components/ConnectToolsPage.tsx +273 -171
- package/src/modules/secrets-vault/components/SecretsPage.tsx +313 -276
- package/src/modules/secrets-vault/components/ToolSecretsPanel.tsx +109 -92
- package/src/modules/secrets-vault/components/__tests__/SecretsPage.test.tsx +82 -51
- package/src/modules/secrets-vault/services/connect.api.ts +24 -3
- package/src/modules/settings/components/DeploymentPage.tsx +90 -0
- package/src/modules/settings/components/SettingsLayout.tsx +135 -0
- package/src/modules/settings/components/SettingsNav.tsx +114 -0
- package/src/modules/settings/components/__tests__/DeploymentPage.test.tsx +110 -0
- package/src/modules/settings/components/__tests__/SettingsLayout.test.tsx +249 -0
- package/src/modules/settings/settings-nav-items.tsx +166 -0
- package/src/modules/setup/__tests__/setup.test.tsx +540 -0
- package/src/modules/setup/components/SetupGate.tsx +67 -0
- package/src/modules/setup/components/SetupScreen.tsx +573 -0
- package/src/modules/setup/services/setup.api.ts +106 -0
- package/src/modules/setup/utils/git-host.ts +34 -0
- package/src/modules/toolbar/components/AppSwitcher.tsx +131 -108
- package/src/modules/toolbar/components/ExternalAgentAccessPage.tsx +548 -548
- package/src/modules/toolbar/components/ProfileMenu.tsx +294 -0
- package/src/modules/toolbar/components/Toolbar.tsx +56 -54
- package/src/modules/toolbar/components/__tests__/AppSwitcher.test.tsx +176 -122
- package/src/modules/toolbar/components/__tests__/Toolbar.test.tsx +252 -77
- package/src/modules/tools/ToolsExplorerPage.tsx +45 -40
- package/src/modules/workspace/__tests__/design-system-parity.test.ts +133 -0
- package/src/modules/workspace/__tests__/testFixtures.ts +2 -0
- package/src/modules/workspace/components/EditorTabs.tsx +82 -50
- package/src/modules/workspace/components/FileExplorer.tsx +1292 -1068
- package/src/modules/workspace/components/FilePaneCard.tsx +53 -0
- package/src/modules/workspace/components/FileRoute.tsx +89 -84
- package/src/modules/workspace/components/FileViewer.tsx +1312 -906
- package/src/modules/workspace/components/KbDocumentShell.tsx +138 -0
- package/src/modules/workspace/components/KbFileRail.tsx +128 -0
- package/src/modules/workspace/components/KbPageHeader.tsx +390 -0
- package/src/modules/workspace/components/__tests__/EditorTabs.test.tsx +87 -3
- package/src/modules/workspace/components/__tests__/FileExplorer.test.tsx +293 -39
- package/src/modules/workspace/components/__tests__/FileRoute.test.tsx +1 -16
- package/src/modules/workspace/components/__tests__/FileViewer.test.tsx +462 -44
- package/src/modules/workspace/components/__tests__/KbDocumentShell.test.tsx +84 -0
- package/src/modules/workspace/components/__tests__/KbFileRail.test.tsx +83 -0
- package/src/modules/workspace/components/__tests__/KbPageHeader.test.tsx +192 -0
- package/src/modules/workspace/components/renderers/CopyAnchorButton.tsx +64 -0
- package/src/modules/workspace/components/renderers/CsvRenderer.tsx +8 -8
- package/src/modules/workspace/components/renderers/DocxRenderer.tsx +18 -9
- package/src/modules/workspace/components/renderers/HtmlRenderer.tsx +14 -14
- package/src/modules/workspace/components/renderers/ImageRenderer.tsx +2 -2
- package/src/modules/workspace/components/renderers/KbMarkdownView.tsx +31 -165
- package/src/modules/workspace/components/renderers/MarkdownRenderer.tsx +18 -5
- package/src/modules/workspace/components/renderers/MermaidDiagram.tsx +27 -10
- package/src/modules/workspace/components/renderers/PdfRenderer.tsx +2 -2
- package/src/modules/workspace/components/renderers/TextRenderer.tsx +11 -5
- package/src/modules/workspace/components/renderers/ToolForm.tsx +24 -24
- package/src/modules/workspace/components/renderers/ToolRenderer.tsx +27 -27
- package/src/modules/workspace/components/renderers/XlsxRenderer.tsx +11 -11
- package/src/modules/workspace/components/renderers/__tests__/DocxRenderer.test.tsx +66 -0
- package/src/modules/workspace/components/renderers/__tests__/KbMarkdownView.test.tsx +17 -1
- package/src/modules/workspace/components/renderers/__tests__/MarkdownRenderer.test.tsx +1 -1
- package/src/modules/workspace/components/renderers/__tests__/MermaidDiagram.test.tsx +58 -0
- package/src/modules/workspace/components/renderers/__tests__/lazyRenderer.test.tsx +68 -0
- package/src/modules/workspace/components/renderers/__tests__/rendererLayout.test.ts +64 -0
- package/src/modules/workspace/components/renderers/__tests__/sanitizeDocxHtml.test.ts +0 -0
- package/src/modules/workspace/components/renderers/chunk-boundary.tsx +71 -0
- package/src/modules/workspace/components/renderers/index.ts +78 -2
- package/src/modules/workspace/components/renderers/kbMarkdownPipeline.tsx +241 -0
- package/src/modules/workspace/components/renderers/lazyRenderer.tsx +59 -0
- package/src/modules/workspace/components/renderers/sanitizeDocxHtml.ts +91 -0
- package/src/modules/workspace/hooks/__tests__/useLinksOut.test.ts +59 -0
- package/src/modules/workspace/hooks/__tests__/useOpenChangeRequests.test.tsx +237 -0
- package/src/modules/workspace/hooks/__tests__/useWorkspaceState.test.tsx +185 -0
- package/src/modules/workspace/hooks/useAutoGrowTextarea.ts +30 -0
- package/src/modules/workspace/hooks/useLastCommit.ts +66 -0
- package/src/modules/workspace/hooks/useLinksOut.ts +56 -0
- package/src/modules/workspace/hooks/useOpenChangeRequests.ts +20 -0
- package/src/modules/workspace/hooks/useWorkspaceState.ts +123 -14
- package/src/modules/workspace/routing/__tests__/kb-routes.test.tsx +1 -1
- package/src/modules/workspace/services/workspace.api.ts +9 -2
- package/src/modules/workspace/state/open-change-requests.context.ts +35 -0
- package/src/modules/workspace/state/open-change-requests.tsx +185 -0
- package/src/modules/workspace/state/workspace.context.ts +9 -0
- package/src/modules/workspace/utils/__tests__/diff.test.ts +87 -0
- package/src/modules/workspace/utils/diff.ts +130 -53
- package/src/modules/workspace/utils/fileTree.ts +182 -179
- package/src/modules/workspace/workspace.css +28 -0
- package/src/shared/components/Badge.tsx +62 -0
- package/src/shared/components/Banner.tsx +58 -0
- package/src/shared/components/Button.tsx +90 -0
- package/src/shared/components/Dialog.tsx +6 -6
- package/src/shared/components/Field.tsx +45 -0
- package/src/shared/components/IconButton.tsx +74 -0
- package/src/shared/components/ListRow.tsx +96 -0
- package/src/shared/components/Menu.tsx +88 -0
- package/src/shared/components/PageShell.tsx +54 -51
- package/src/shared/components/Surface.tsx +86 -0
- package/src/shared/components/__tests__/primitives.test.tsx +333 -0
- package/src/shared/components/index.ts +48 -0
- package/src/shared/components/useDismissableMenu.ts +71 -0
- package/src/shared/theme/__tests__/accent-contrast.test.ts +84 -0
- package/src/shared/theme/index.css +12 -0
- package/src/shared/theme/measure.ts +64 -0
- package/src/shared/theme/shadows.css +34 -0
- package/src/shared/theme/tokens.css +193 -0
- package/src/test-setup.ts +9 -0
- package/src/modules/access/components/AccessRestrictedBanner.tsx +0 -31
- package/src/modules/access/components/NodeOwnersBanner.tsx +0 -30
- package/src/modules/git/__tests__/ProtectedBranchBanner.test.tsx +0 -82
- package/src/modules/git/components/ProtectedBranchBanner.tsx +0 -42
- package/src/modules/library/__tests__/DetailDialog.test.tsx +0 -200
- package/src/modules/library/__tests__/diff.test.ts +0 -62
- package/src/modules/library/__tests__/loadout.test.tsx +0 -72
- package/src/modules/library/components/CompareView.tsx +0 -357
- package/src/modules/library/components/DetailDialog.tsx +0 -566
- package/src/modules/library/components/GearIcon.tsx +0 -12
- package/src/modules/library/components/LoadoutSidebar.tsx +0 -156
- package/src/modules/library/components/StatusGem.tsx +0 -21
- package/src/modules/library/components/SuggestChange.tsx +0 -171
- package/src/modules/library/components/particles.ts +0 -50
- package/src/modules/library/state/loadout.tsx +0 -129
- package/src/modules/library/utils/diff.ts +0 -102
- package/src/modules/pr/__tests__/PrApprovalBadge.test.tsx +0 -93
- package/src/modules/pr/__tests__/PrCancelButton.test.tsx +0 -158
- package/src/modules/pr/__tests__/PrCancelConfirmDialog.test.tsx +0 -44
- package/src/modules/pr/__tests__/PrMergeButton.test.tsx +0 -360
- package/src/modules/pr/__tests__/bucketize-comments.test.ts +0 -85
- package/src/modules/pr/__tests__/parsePatch.test.ts +0 -104
- package/src/modules/pr/__tests__/usePrViewerState.test.ts +0 -72
- package/src/modules/pr/components/PrApprovalBadge.tsx +0 -80
- package/src/modules/pr/components/PrCancelButton.tsx +0 -99
- package/src/modules/pr/components/PrCancelConfirmDialog.tsx +0 -119
- package/src/modules/pr/components/PrCommentComposer.tsx +0 -92
- package/src/modules/pr/components/PrCommentThread.tsx +0 -168
- package/src/modules/pr/components/PrCommentsPanel.tsx +0 -143
- package/src/modules/pr/components/PrDiffPane.tsx +0 -425
- package/src/modules/pr/components/PrFileRow.tsx +0 -164
- package/src/modules/pr/components/PrFilesList.tsx +0 -53
- package/src/modules/pr/components/PrHeader.tsx +0 -45
- package/src/modules/pr/components/PrHeaderOverflowMenu.tsx +0 -58
- package/src/modules/pr/components/PrMergeButton.tsx +0 -268
- package/src/modules/pr/components/PrMergeConfirmDialog.tsx +0 -112
- package/src/modules/pr/components/PrRefreshFromTargetButton.tsx +0 -110
- package/src/modules/pr/components/PrViewer.tsx +0 -364
- package/src/modules/pr/hooks/usePrViewerState.ts +0 -150
- package/src/modules/pr/state/pr-viewer.context.ts +0 -34
- package/src/modules/pr/utils/bucketize-comments.ts +0 -55
- package/src/modules/pr/utils/parsePatch.ts +0 -57
- package/src/modules/toolbar/components/AdminMenu.tsx +0 -271
|
@@ -0,0 +1,134 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { collapseUnchanged, diffLines, hasChanges } from '../utils/diff';
|
|
3
|
+
|
|
4
|
+
describe('diffLines (LCS line differ)', () => {
|
|
5
|
+
it('reports identical content as all-same', () => {
|
|
6
|
+
const d = diffLines('a\nb\nc', 'a\nb\nc');
|
|
7
|
+
expect(d).toEqual([
|
|
8
|
+
{ kind: 'same', text: 'a' },
|
|
9
|
+
{ kind: 'same', text: 'b' },
|
|
10
|
+
{ kind: 'same', text: 'c' },
|
|
11
|
+
]);
|
|
12
|
+
expect(hasChanges(d)).toBe(false);
|
|
13
|
+
});
|
|
14
|
+
|
|
15
|
+
it('marks a replaced line as removed-then-added in place', () => {
|
|
16
|
+
const d = diffLines('one\ntwo\nthree', 'one\nTWO\nthree');
|
|
17
|
+
expect(d).toEqual([
|
|
18
|
+
{ kind: 'same', text: 'one' },
|
|
19
|
+
{ kind: 'removed', text: 'two' },
|
|
20
|
+
{ kind: 'added', text: 'TWO' },
|
|
21
|
+
{ kind: 'same', text: 'three' },
|
|
22
|
+
]);
|
|
23
|
+
});
|
|
24
|
+
|
|
25
|
+
it('handles pure insertions and deletions', () => {
|
|
26
|
+
expect(diffLines('a\nc', 'a\nb\nc')).toEqual([
|
|
27
|
+
{ kind: 'same', text: 'a' },
|
|
28
|
+
{ kind: 'added', text: 'b' },
|
|
29
|
+
{ kind: 'same', text: 'c' },
|
|
30
|
+
]);
|
|
31
|
+
expect(diffLines('a\nb\nc', 'a\nc')).toEqual([
|
|
32
|
+
{ kind: 'same', text: 'a' },
|
|
33
|
+
{ kind: 'removed', text: 'b' },
|
|
34
|
+
{ kind: 'same', text: 'c' },
|
|
35
|
+
]);
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
it('keeps unrelated equal lines matched across a multi-line rewrite', () => {
|
|
39
|
+
const before = '# title\nstep 1\nstep 2\nstep 3\nfooter';
|
|
40
|
+
const after = '# title\nstep 1 tightened\nstep 3\nnew step 4\nfooter';
|
|
41
|
+
const d = diffLines(before, after);
|
|
42
|
+
expect(d.filter((l) => l.kind === 'same').map((l) => l.text)).toEqual([
|
|
43
|
+
'# title',
|
|
44
|
+
'step 3',
|
|
45
|
+
'footer',
|
|
46
|
+
]);
|
|
47
|
+
expect(d.filter((l) => l.kind === 'removed').map((l) => l.text)).toEqual([
|
|
48
|
+
'step 1',
|
|
49
|
+
'step 2',
|
|
50
|
+
]);
|
|
51
|
+
expect(d.filter((l) => l.kind === 'added').map((l) => l.text)).toEqual([
|
|
52
|
+
'step 1 tightened',
|
|
53
|
+
'new step 4',
|
|
54
|
+
]);
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
it('handles empty sides and trailing newlines', () => {
|
|
58
|
+
expect(diffLines('', 'a\n')).toEqual([{ kind: 'added', text: 'a' }]);
|
|
59
|
+
expect(diffLines('a\n', '')).toEqual([{ kind: 'removed', text: 'a' }]);
|
|
60
|
+
expect(diffLines('', '')).toEqual([]);
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
/**
|
|
64
|
+
* A KB file checked out on Windows has CRLF endings; a `<textarea>` hands its
|
|
65
|
+
* value back as LF. Without normalisation a one-word edit renders as a
|
|
66
|
+
* whole-file rewrite — which is what shipped before this test existed.
|
|
67
|
+
*/
|
|
68
|
+
it('ignores CRLF-vs-LF so an edited file is not a whole-file rewrite', () => {
|
|
69
|
+
const crlf = 'a\r\nb\r\nc\r\n';
|
|
70
|
+
const lf = 'a\nb\nc\n';
|
|
71
|
+
expect(hasChanges(diffLines(crlf, lf))).toBe(false);
|
|
72
|
+
|
|
73
|
+
const edited = 'a\nb changed\nc\n';
|
|
74
|
+
const d = diffLines(crlf, edited);
|
|
75
|
+
expect(d.filter((l) => l.kind === 'removed').map((l) => l.text)).toEqual(['b']);
|
|
76
|
+
expect(d.filter((l) => l.kind === 'added').map((l) => l.text)).toEqual(['b changed']);
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
describe('collapseUnchanged', () => {
|
|
81
|
+
it('folds long unchanged runs into a counted gap, keeping context', () => {
|
|
82
|
+
const before = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'target', 'i', 'j'].join('\n');
|
|
83
|
+
const after = before.replace('target', 'changed');
|
|
84
|
+
const rows = collapseUnchanged(diffLines(before, after));
|
|
85
|
+
|
|
86
|
+
const gaps = rows.filter((r) => r.kind === 'gap');
|
|
87
|
+
expect(gaps).toHaveLength(1);
|
|
88
|
+
// 8 lines precede the change; 2 are kept as context, so 6 are folded.
|
|
89
|
+
expect(gaps[0]).toEqual({ kind: 'gap', count: 6 });
|
|
90
|
+
expect(rows.some((r) => r.kind === 'removed' && r.text === 'target')).toBe(true);
|
|
91
|
+
expect(rows.some((r) => r.kind === 'added' && r.text === 'changed')).toBe(true);
|
|
92
|
+
});
|
|
93
|
+
|
|
94
|
+
it('leaves a diff with nothing worth folding alone', () => {
|
|
95
|
+
const rows = collapseUnchanged(diffLines('a\nb', 'a\nB'));
|
|
96
|
+
expect(rows.some((r) => r.kind === 'gap')).toBe(false);
|
|
97
|
+
});
|
|
98
|
+
|
|
99
|
+
/**
|
|
100
|
+
* Two changes `sameCount` unchanged lines apart. With the default context of
|
|
101
|
+
* 2, four of those are kept either side, so the hidden run is `sameCount - 4`.
|
|
102
|
+
*/
|
|
103
|
+
function betweenTwoChanges(sameCount: number) {
|
|
104
|
+
const middle = Array.from({ length: sameCount }, (_, i) => `m${i}`);
|
|
105
|
+
return collapseUnchanged(
|
|
106
|
+
diffLines(['a', ...middle, 'z'].join('\n'), ['A', ...middle, 'Z'].join('\n')),
|
|
107
|
+
);
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
it('emits a short hidden run verbatim rather than as a gap', () => {
|
|
111
|
+
// A "1 unchanged line" button costs the row it hides and shows less.
|
|
112
|
+
const rows = betweenTwoChanges(5);
|
|
113
|
+
expect(rows.some((r) => r.kind === 'gap')).toBe(false);
|
|
114
|
+
// `&&` narrows the union where `.filter().map()` would not.
|
|
115
|
+
expect(rows.some((r) => r.kind === 'same' && r.text === 'm2')).toBe(true);
|
|
116
|
+
});
|
|
117
|
+
|
|
118
|
+
it('folds only runs longer than context * 2', () => {
|
|
119
|
+
// Exactly at the threshold (4 hidden) — kept.
|
|
120
|
+
const atThreshold = betweenTwoChanges(8);
|
|
121
|
+
expect(atThreshold.some((r) => r.kind === 'gap')).toBe(false);
|
|
122
|
+
expect(atThreshold.filter((r) => r.kind === 'same')).toHaveLength(8);
|
|
123
|
+
|
|
124
|
+
// One past it (5 hidden) — folded, and the count is what was hidden.
|
|
125
|
+
const past = betweenTwoChanges(9);
|
|
126
|
+
expect(past.filter((r) => r.kind === 'gap')).toEqual([{ kind: 'gap', count: 5 }]);
|
|
127
|
+
});
|
|
128
|
+
|
|
129
|
+
it('honours a caller-supplied context when deciding what to fold', () => {
|
|
130
|
+
// context 0 ⇒ nothing is kept for company and every run over 0 folds.
|
|
131
|
+
const rows = collapseUnchanged(diffLines('a\nb\nc\nz', 'A\nb\nc\nZ'), 0);
|
|
132
|
+
expect(rows.filter((r) => r.kind === 'gap')).toEqual([{ kind: 'gap', count: 2 }]);
|
|
133
|
+
});
|
|
134
|
+
});
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
2
|
+
|
|
3
|
+
const gitApi = vi.hoisted(() => ({
|
|
4
|
+
createBranch: vi.fn(),
|
|
5
|
+
deleteBranch: vi.fn(),
|
|
6
|
+
}));
|
|
7
|
+
vi.mock('../../git/services/git.api', () => gitApi);
|
|
8
|
+
const wsApi = vi.hoisted(() => ({
|
|
9
|
+
getOrCreateWorkspace: vi.fn(async () => ({
|
|
10
|
+
workspace: { id: 'sugg-ws', kbDirName: 'knowledge-base' },
|
|
11
|
+
})),
|
|
12
|
+
writeFile: vi.fn(async () => {}),
|
|
13
|
+
}));
|
|
14
|
+
vi.mock('../../workspace/services/workspace.api', () => wsApi);
|
|
15
|
+
vi.mock('../../pr/services/pr-open.api', () => ({ openChangeRequest: vi.fn(async () => null) }));
|
|
16
|
+
const listMine = vi.hoisted(() => vi.fn(async (): Promise<unknown[]> => []));
|
|
17
|
+
vi.mock('../services/change-requests.api', () => ({ listMyChangeRequests: listMine }));
|
|
18
|
+
|
|
19
|
+
import { ensureKnowledgeSuggestionWorkspace } from '../services/propose.api';
|
|
20
|
+
|
|
21
|
+
const rae = { email: 'reader@example.com', id: 'u9-1234-abcd' };
|
|
22
|
+
|
|
23
|
+
describe('ensureKnowledgeSuggestionWorkspace: branch reuse', () => {
|
|
24
|
+
beforeEach(() => {
|
|
25
|
+
gitApi.createBranch.mockReset();
|
|
26
|
+
gitApi.deleteBranch.mockReset();
|
|
27
|
+
listMine.mockReset().mockResolvedValue([]);
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
it('creates the branch fresh when nothing is in the way', async () => {
|
|
31
|
+
gitApi.createBranch.mockResolvedValue(undefined);
|
|
32
|
+
const target = await ensureKnowledgeSuggestionWorkspace(rae);
|
|
33
|
+
// The id slice keeps two users with colliding email localparts apart.
|
|
34
|
+
expect(target.branch).toBe('suggestions/reader-u9-1234-/knowledge');
|
|
35
|
+
expect(gitApi.deleteBranch).not.toHaveBeenCalled();
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* A leftover branch (a withdrawn round, a merge whose retirement failed)
|
|
40
|
+
* still carries its commits, and reusing it re-proposes them. So the flow
|
|
41
|
+
* TRIES a reset — delete (the server also retires the stale workspace
|
|
42
|
+
* clone) and recreate from the default branch.
|
|
43
|
+
*/
|
|
44
|
+
it('resets a leftover branch: delete, then recreate fresh', async () => {
|
|
45
|
+
gitApi.createBranch
|
|
46
|
+
.mockRejectedValueOnce(new Error("a branch named 'x' already exists"))
|
|
47
|
+
.mockResolvedValueOnce(undefined);
|
|
48
|
+
gitApi.deleteBranch.mockResolvedValue(undefined);
|
|
49
|
+
|
|
50
|
+
const target = await ensureKnowledgeSuggestionWorkspace(rae);
|
|
51
|
+
|
|
52
|
+
expect(gitApi.deleteBranch).toHaveBeenCalledWith(
|
|
53
|
+
expect.any(String),
|
|
54
|
+
'suggestions/reader-u9-1234-/knowledge',
|
|
55
|
+
);
|
|
56
|
+
expect(gitApi.createBranch).toHaveBeenCalledTimes(2);
|
|
57
|
+
expect(target.branch).toBe('suggestions/reader-u9-1234-/knowledge');
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
it('falls back to plain reuse when the reset itself is refused', async () => {
|
|
61
|
+
gitApi.createBranch.mockRejectedValue(new Error("a branch named 'x' already exists"));
|
|
62
|
+
gitApi.deleteBranch.mockRejectedValue(new Error('403'));
|
|
63
|
+
|
|
64
|
+
// No throw: the change request is what makes the branch reviewable, so a
|
|
65
|
+
// refused reset degrades to the pre-existing reuse behaviour.
|
|
66
|
+
const target = await ensureKnowledgeSuggestionWorkspace(rae);
|
|
67
|
+
expect(target.workspaceId).toBe('sugg-ws');
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
/**
|
|
71
|
+
* Only an already-exists refusal is evidence of a leftover worth
|
|
72
|
+
* resetting. A transient failure says nothing about the branch, and
|
|
73
|
+
* "delete on any error" could tear down a branch the error never
|
|
74
|
+
* implicated.
|
|
75
|
+
*/
|
|
76
|
+
it('does not attempt a reset on a transient createBranch failure', async () => {
|
|
77
|
+
gitApi.createBranch.mockRejectedValue(new Error('network down'));
|
|
78
|
+
const target = await ensureKnowledgeSuggestionWorkspace(rae);
|
|
79
|
+
expect(gitApi.deleteBranch).not.toHaveBeenCalled();
|
|
80
|
+
// The flow still proceeds — the write path surfaces anything real.
|
|
81
|
+
expect(target.workspaceId).toBe('sugg-ws');
|
|
82
|
+
});
|
|
83
|
+
|
|
84
|
+
it('never touches the branch when the caller already has an open request on it', async () => {
|
|
85
|
+
listMine.mockResolvedValue([
|
|
86
|
+
{ number: 12, state: 'open', branch: 'suggestions/reader-u9-1234-/knowledge' },
|
|
87
|
+
]);
|
|
88
|
+
const target = await ensureKnowledgeSuggestionWorkspace(rae);
|
|
89
|
+
expect(target.existingCr).not.toBeNull();
|
|
90
|
+
expect(gitApi.createBranch).not.toHaveBeenCalled();
|
|
91
|
+
expect(gitApi.deleteBranch).not.toHaveBeenCalled();
|
|
92
|
+
});
|
|
93
|
+
});
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
2
|
+
import { renderHook, waitFor } from '@testing-library/react';
|
|
3
|
+
|
|
4
|
+
const api = vi.hoisted(() => ({ readFileOnBranch: vi.fn() }));
|
|
5
|
+
vi.mock('../services/change-requests.api', () => ({
|
|
6
|
+
readFileOnBranch: api.readFileOnBranch,
|
|
7
|
+
}));
|
|
8
|
+
|
|
9
|
+
import { useFileOnBranch } from '../hooks/useFileOnBranch';
|
|
10
|
+
|
|
11
|
+
beforeEach(() => {
|
|
12
|
+
api.readFileOnBranch
|
|
13
|
+
.mockReset()
|
|
14
|
+
.mockImplementation(async (_branch: string, path: string) => `content of ${path}`);
|
|
15
|
+
});
|
|
16
|
+
|
|
17
|
+
describe('useFileOnBranch', () => {
|
|
18
|
+
it('returns the file once the read lands', async () => {
|
|
19
|
+
const { result } = renderHook(() => useFileOnBranch('main', 'Groups/Sales/deck/SKILL.md'));
|
|
20
|
+
expect(result.current).toBeNull();
|
|
21
|
+
await waitFor(() => expect(result.current).toBe('content of Groups/Sales/deck/SKILL.md'));
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* The skill page's tabs oscillate the path: SKILL.md → a bundled file →
|
|
26
|
+
* SKILL.md. The return leg finds its key already asked (correct — the answer
|
|
27
|
+
* exists), so the hook must serve it FROM CACHE. The single-slot version of
|
|
28
|
+
* this hook held only the LAST answer: the return leg matched nothing,
|
|
29
|
+
* refetched nothing, and the pane sat on "Loading…" forever.
|
|
30
|
+
*/
|
|
31
|
+
it('serves an earlier path from cache when the path oscillates A→B→A', async () => {
|
|
32
|
+
const { result, rerender } = renderHook(({ path }) => useFileOnBranch('main', path), {
|
|
33
|
+
initialProps: { path: 'skill/SKILL.md' },
|
|
34
|
+
});
|
|
35
|
+
await waitFor(() => expect(result.current).toBe('content of skill/SKILL.md'));
|
|
36
|
+
|
|
37
|
+
rerender({ path: 'skill/reference/LESSONS.md' });
|
|
38
|
+
await waitFor(() => expect(result.current).toBe('content of skill/reference/LESSONS.md'));
|
|
39
|
+
|
|
40
|
+
rerender({ path: 'skill/SKILL.md' });
|
|
41
|
+
// Immediately available again — no refetch, no eternal "Loading…".
|
|
42
|
+
expect(result.current).toBe('content of skill/SKILL.md');
|
|
43
|
+
expect(api.readFileOnBranch).toHaveBeenCalledTimes(2);
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
it('a null path fetches nothing and returns null', async () => {
|
|
47
|
+
const { result } = renderHook(() => useFileOnBranch('main', null));
|
|
48
|
+
expect(result.current).toBeNull();
|
|
49
|
+
await new Promise((r) => setTimeout(r, 0));
|
|
50
|
+
expect(api.readFileOnBranch).not.toHaveBeenCalled();
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
it('a bumped revision refetches and serves the new copy', async () => {
|
|
54
|
+
const { result, rerender } = renderHook(
|
|
55
|
+
({ rev }) => useFileOnBranch('main', 'skill/SKILL.md', rev),
|
|
56
|
+
{ initialProps: { rev: 0 } },
|
|
57
|
+
);
|
|
58
|
+
await waitFor(() => expect(result.current).toBe('content of skill/SKILL.md'));
|
|
59
|
+
|
|
60
|
+
api.readFileOnBranch.mockImplementation(async () => 'merged copy');
|
|
61
|
+
rerender({ rev: 1 });
|
|
62
|
+
await waitFor(() => expect(result.current).toBe('merged copy'));
|
|
63
|
+
expect(api.readFileOnBranch).toHaveBeenCalledTimes(2);
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
it('a failed read stays null rather than reporting an empty file', async () => {
|
|
67
|
+
api.readFileOnBranch.mockRejectedValue(new Error('403'));
|
|
68
|
+
const { result } = renderHook(() => useFileOnBranch('main', 'skill/SKILL.md'));
|
|
69
|
+
await new Promise((r) => setTimeout(r, 0));
|
|
70
|
+
expect(result.current).toBeNull();
|
|
71
|
+
});
|
|
72
|
+
});
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/* ── diff marks for proposed changes ──
|
|
2
|
+
Shared by every surface that renders a proposal's diff: the change boxes
|
|
3
|
+
(Library skill pages AND the Knowledge viewer), the compare view, and the
|
|
4
|
+
inline own-suggestion marks. `mark-del` / `mark-ins` are alpha, so they
|
|
5
|
+
tint whatever row they land on instead of punching a solid block through
|
|
6
|
+
it. The `lib-` prefix is historical (these started in the Library) and
|
|
7
|
+
kept so the existing call sites don't churn. */
|
|
8
|
+
.lib-sug del {
|
|
9
|
+
color: var(--color-danger);
|
|
10
|
+
background: var(--color-mark-del);
|
|
11
|
+
text-decoration: line-through;
|
|
12
|
+
padding: 0 3px;
|
|
13
|
+
border-radius: var(--radius-xs);
|
|
14
|
+
}
|
|
15
|
+
.lib-sug ins {
|
|
16
|
+
color: var(--color-ok);
|
|
17
|
+
background: var(--color-mark-ins);
|
|
18
|
+
text-decoration: none;
|
|
19
|
+
padding: 0 3px;
|
|
20
|
+
border-radius: var(--radius-xs);
|
|
21
|
+
font-weight: 600;
|
|
22
|
+
}
|
|
@@ -0,0 +1,277 @@
|
|
|
1
|
+
import { useState } from 'react';
|
|
2
|
+
import '../change-requests.css';
|
|
3
|
+
import { Button, Surface } from '../../../shared/components';
|
|
4
|
+
import { cn } from '../../../lib/utils';
|
|
5
|
+
import { collapseUnchanged, type DiffLine } from '../utils/diff';
|
|
6
|
+
import { ConflictHelp } from './ConflictHelp';
|
|
7
|
+
|
|
8
|
+
export interface ChangeBoxProps {
|
|
9
|
+
/** File the proposal is against, relative to the skill folder. */
|
|
10
|
+
file: string;
|
|
11
|
+
/** Display name of whoever proposed it. */
|
|
12
|
+
author: string;
|
|
13
|
+
/** Already-formatted, e.g. "today" or "2 Aug". */
|
|
14
|
+
when: string;
|
|
15
|
+
/** The caller wrote this one. */
|
|
16
|
+
mine: boolean;
|
|
17
|
+
/** The caller decides this one (owns the skill). */
|
|
18
|
+
canDecide: boolean;
|
|
19
|
+
/** The proposal diffed against the file as it stands NOW; null while loading. */
|
|
20
|
+
diff: DiffLine[] | null;
|
|
21
|
+
/**
|
|
22
|
+
* The file is binary (an image, a document…): there is no text to diff,
|
|
23
|
+
* and the box says so instead of loading forever. The verdict buttons keep
|
|
24
|
+
* working — approving still applies the whole request.
|
|
25
|
+
*/
|
|
26
|
+
binary?: boolean;
|
|
27
|
+
/**
|
|
28
|
+
* This file already reads the way the proposal wants it to — someone landed
|
|
29
|
+
* the same edit first, or the author reverted it. There is nothing here to
|
|
30
|
+
* decide, though the change request may still touch other files.
|
|
31
|
+
*/
|
|
32
|
+
upToDate?: boolean;
|
|
33
|
+
/**
|
|
34
|
+
* The change cannot land as it stands — the file moved under it. Discovered
|
|
35
|
+
* when a merge is attempted, which is the only moment git can answer the
|
|
36
|
+
* question honestly.
|
|
37
|
+
*/
|
|
38
|
+
blocked?: boolean;
|
|
39
|
+
/**
|
|
40
|
+
* The ready-to-paste prompt that asks the user's agent to resolve the
|
|
41
|
+
* conflict (see `conflictResolutionPrompt`). Rendered only while `blocked`.
|
|
42
|
+
*/
|
|
43
|
+
conflictPrompt?: string | null;
|
|
44
|
+
/**
|
|
45
|
+
* Why the last apply did not land, in the words the server used. Distinct
|
|
46
|
+
* from `blocked`: a conflict withdraws Approve because retrying cannot help,
|
|
47
|
+
* whereas "waiting on approval from Design" is a state that can change under
|
|
48
|
+
* the reader, so the button stays.
|
|
49
|
+
*/
|
|
50
|
+
refusal?: string | null;
|
|
51
|
+
/** Who the decision is waiting on, for the non-owner's footer. */
|
|
52
|
+
owner?: string;
|
|
53
|
+
busy?: boolean;
|
|
54
|
+
/**
|
|
55
|
+
* What the apply is doing right now, so the label names the step instead of
|
|
56
|
+
* a generic wait. Recording approvals and merging are separately slow — the
|
|
57
|
+
* merge alone runs to tens of seconds server-side.
|
|
58
|
+
*/
|
|
59
|
+
phase?: 'idle' | 'approving' | 'applying';
|
|
60
|
+
onApprove?(): void;
|
|
61
|
+
onDecline?(): void;
|
|
62
|
+
onWithdraw?(): void;
|
|
63
|
+
/** Owner-side: read the whole change request, not just this file's part. */
|
|
64
|
+
onOpenFull?(): void;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* One proposed change to one file — the prototype's `.changebox` (line 2040).
|
|
69
|
+
*
|
|
70
|
+
* It sits UNDER the file it is about, rather than in a review queue somewhere
|
|
71
|
+
* else, because the question it asks ("should this text become that text?") is
|
|
72
|
+
* unanswerable without the text. The diff is against the file as it stands now,
|
|
73
|
+
* not against what the author started from: what matters to the person deciding
|
|
74
|
+
* is what would change if they said yes.
|
|
75
|
+
*
|
|
76
|
+
* Two independent states, easily confused:
|
|
77
|
+
*
|
|
78
|
+
* - `diff === null` means the comparison has not ARRIVED yet — one of the two
|
|
79
|
+
* file reads is still in flight — and the box says "Loading the change…".
|
|
80
|
+
* It is never a claim about the change itself; an absent diff is never
|
|
81
|
+
* rendered as an empty or whole-file one.
|
|
82
|
+
* - `blocked` means the change cannot LAND: the file moved under it, which git
|
|
83
|
+
* only reveals when a merge is attempted. It withholds Approve (Decline and
|
|
84
|
+
* Withdraw stay, since both are still valid answers) because merging a
|
|
85
|
+
* change written against text that has since moved silently discards
|
|
86
|
+
* whoever landed first. The box names the fix instead of offering a button
|
|
87
|
+
* that would do the wrong thing.
|
|
88
|
+
*/
|
|
89
|
+
export function ChangeBox({
|
|
90
|
+
file,
|
|
91
|
+
author,
|
|
92
|
+
when,
|
|
93
|
+
mine,
|
|
94
|
+
canDecide,
|
|
95
|
+
diff,
|
|
96
|
+
binary = false,
|
|
97
|
+
upToDate = false,
|
|
98
|
+
blocked = false,
|
|
99
|
+
conflictPrompt = null,
|
|
100
|
+
refusal = null,
|
|
101
|
+
owner,
|
|
102
|
+
busy,
|
|
103
|
+
phase = 'idle',
|
|
104
|
+
onApprove,
|
|
105
|
+
onDecline,
|
|
106
|
+
onWithdraw,
|
|
107
|
+
onOpenFull,
|
|
108
|
+
}: ChangeBoxProps) {
|
|
109
|
+
const who = mine ? 'You' : author;
|
|
110
|
+
// Name the step. "Approving…" and "Applying…" are different waits with
|
|
111
|
+
// different lengths, and a single "Working…" over both makes the slower one
|
|
112
|
+
// look hung.
|
|
113
|
+
const busyLabel =
|
|
114
|
+
phase === 'approving' ? 'Approving…' : phase === 'applying' ? 'Applying…' : 'Working…';
|
|
115
|
+
|
|
116
|
+
return (
|
|
117
|
+
<Surface
|
|
118
|
+
tone="surface"
|
|
119
|
+
radius="lg"
|
|
120
|
+
elevation="card"
|
|
121
|
+
className={cn('mt-3 overflow-hidden', blocked && 'border-wait')}
|
|
122
|
+
>
|
|
123
|
+
<div className="flex flex-wrap items-center gap-2 border-b border-line px-3.5 py-2">
|
|
124
|
+
<span className="text-detail text-ink">
|
|
125
|
+
<b className="font-semibold">{who}</b> proposed a change · {when}
|
|
126
|
+
</span>
|
|
127
|
+
<span className="ml-auto truncate font-mono text-meta text-ink-faint">{file}</span>
|
|
128
|
+
</div>
|
|
129
|
+
|
|
130
|
+
{/* No diff area when there is no difference — an empty pane under a
|
|
131
|
+
"what changed?" heading reads as a rendering failure. */}
|
|
132
|
+
{upToDate ? null : binary ? (
|
|
133
|
+
<p className="px-3.5 py-4 text-center text-detail text-ink-faint">
|
|
134
|
+
A binary file (an image, a document…). There is no text to compare. Read the whole
|
|
135
|
+
change to decide.
|
|
136
|
+
</p>
|
|
137
|
+
) : diff === null ? (
|
|
138
|
+
<p className="px-3.5 py-4 text-center text-detail text-ink-faint">Loading the change…</p>
|
|
139
|
+
) : (
|
|
140
|
+
<CollapsedDiffView lines={diff} />
|
|
141
|
+
)}
|
|
142
|
+
|
|
143
|
+
<div
|
|
144
|
+
className={cn(
|
|
145
|
+
'flex flex-wrap items-center gap-3 px-3.5 py-2.5',
|
|
146
|
+
blocked ? 'bg-wait-soft' : 'border-t border-line',
|
|
147
|
+
)}
|
|
148
|
+
>
|
|
149
|
+
{upToDate ? (
|
|
150
|
+
<>
|
|
151
|
+
<span className="text-detail font-semibold text-ok">Already up to date</span>
|
|
152
|
+
<span className="w-full text-meta text-ink-muted">
|
|
153
|
+
This file already reads the way this change proposes. The change request may still
|
|
154
|
+
touch other files.
|
|
155
|
+
</span>
|
|
156
|
+
</>
|
|
157
|
+
) : blocked ? (
|
|
158
|
+
<>
|
|
159
|
+
<span className="text-detail font-semibold text-wait">
|
|
160
|
+
Blocked: these lines changed after this was written
|
|
161
|
+
</span>
|
|
162
|
+
<span className="w-full text-meta text-ink-muted">
|
|
163
|
+
{mine
|
|
164
|
+
? 'It has to be redone against the current text before it can land.'
|
|
165
|
+
: `It cannot be approved as it stands. It has to be redone against the current text.`}
|
|
166
|
+
</span>
|
|
167
|
+
{conflictPrompt && <ConflictHelp prompt={conflictPrompt} />}
|
|
168
|
+
</>
|
|
169
|
+
) : (
|
|
170
|
+
<>
|
|
171
|
+
{/* ONE live region across the whole idle↔busy transition, rather
|
|
172
|
+
than one mounted when the apply starts. A live region inserted
|
|
173
|
+
in the same breath as its text is widely not announced at all —
|
|
174
|
+
assistive tech watches regions it was already holding. So this
|
|
175
|
+
element persists and only its TEXT changes, which is the change
|
|
176
|
+
that gets read out. It is also why the busy state is not a
|
|
177
|
+
separate branch: a branch would unmount this one.
|
|
178
|
+
|
|
179
|
+
The wait itself is worth announcing because the merge runs on
|
|
180
|
+
the server after the request returns and takes tens of seconds
|
|
181
|
+
— a silent button reads as a click that did nothing. */}
|
|
182
|
+
<span
|
|
183
|
+
role="status"
|
|
184
|
+
aria-live="polite"
|
|
185
|
+
className="flex items-center gap-1.5 text-detail font-semibold text-wait"
|
|
186
|
+
>
|
|
187
|
+
<span className={cn('size-1.5 rounded-full bg-wait-dot', busy && 'animate-pulse')} />
|
|
188
|
+
{busy
|
|
189
|
+
? phase === 'approving'
|
|
190
|
+
? 'Recording your approval…'
|
|
191
|
+
: 'Applying the change…'
|
|
192
|
+
: 'Pending approval'}
|
|
193
|
+
</span>
|
|
194
|
+
{!busy && (
|
|
195
|
+
<span className="text-meta text-ink-faint">
|
|
196
|
+
{canDecide ? 'You decide. You own this.' : `Waiting on ${owner ?? 'the owner'}`}
|
|
197
|
+
</span>
|
|
198
|
+
)}
|
|
199
|
+
{/* What the server said, verbatim. The gate names the files and the
|
|
200
|
+
people it is still waiting on, and that sentence is the whole
|
|
201
|
+
value — paraphrasing it to "couldn't approve" would strip the
|
|
202
|
+
one part the owner can act on. */}
|
|
203
|
+
{refusal && !busy && (
|
|
204
|
+
<span role="alert" className="w-full text-meta text-danger">
|
|
205
|
+
{refusal}
|
|
206
|
+
</span>
|
|
207
|
+
)}
|
|
208
|
+
</>
|
|
209
|
+
)}
|
|
210
|
+
|
|
211
|
+
<span className="ml-auto flex shrink-0 items-center gap-2">
|
|
212
|
+
{onOpenFull && (
|
|
213
|
+
<Button variant="quiet" size="tiny" onClick={onOpenFull} disabled={busy}>
|
|
214
|
+
Read the whole change
|
|
215
|
+
</Button>
|
|
216
|
+
)}
|
|
217
|
+
{mine && onWithdraw && (
|
|
218
|
+
<Button variant="quiet" size="tiny" onClick={onWithdraw} disabled={busy}>
|
|
219
|
+
Withdraw
|
|
220
|
+
</Button>
|
|
221
|
+
)}
|
|
222
|
+
{/* Both verdicts act on the WHOLE change request, so neither is
|
|
223
|
+
offered against a file with nothing to show: approving would
|
|
224
|
+
merge, and declining would kill, a request whose other files this
|
|
225
|
+
panel is not displaying. "Read the whole change" is the honest
|
|
226
|
+
route to that decision. */}
|
|
227
|
+
{canDecide && !upToDate && onDecline && (
|
|
228
|
+
<Button variant="quiet" size="tiny" onClick={onDecline} disabled={busy}>
|
|
229
|
+
Decline
|
|
230
|
+
</Button>
|
|
231
|
+
)}
|
|
232
|
+
{canDecide && !upToDate && !blocked && onApprove && (
|
|
233
|
+
<Button variant="primary" size="tiny" onClick={onApprove} disabled={busy}>
|
|
234
|
+
{busy ? busyLabel : 'Approve'}
|
|
235
|
+
</Button>
|
|
236
|
+
)}
|
|
237
|
+
</span>
|
|
238
|
+
</div>
|
|
239
|
+
</Surface>
|
|
240
|
+
);
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
function CollapsedDiffView({ lines }: { lines: DiffLine[] }) {
|
|
244
|
+
const [expanded, setExpanded] = useState(false);
|
|
245
|
+
const rows = expanded
|
|
246
|
+
? lines.map((l) => l)
|
|
247
|
+
: collapseUnchanged(lines);
|
|
248
|
+
|
|
249
|
+
return (
|
|
250
|
+
<div className="max-h-96 overflow-y-auto px-3.5 py-3">
|
|
251
|
+
<pre className="lib-sug whitespace-pre-wrap break-words font-mono text-detail leading-relaxed text-ink-muted">
|
|
252
|
+
{rows.map((r, i) =>
|
|
253
|
+
r.kind === 'gap' ? (
|
|
254
|
+
<button
|
|
255
|
+
key={i}
|
|
256
|
+
type="button"
|
|
257
|
+
className="my-1 block w-full rounded-xs bg-sunken py-0.5 text-center text-meta text-ink-faint hover:text-ink"
|
|
258
|
+
onClick={() => setExpanded(true)}
|
|
259
|
+
>
|
|
260
|
+
{r.count} unchanged {r.count === 1 ? 'line' : 'lines'}
|
|
261
|
+
</button>
|
|
262
|
+
) : r.kind === 'removed' ? (
|
|
263
|
+
<del key={i} className="block">
|
|
264
|
+
{r.text || ' '}
|
|
265
|
+
</del>
|
|
266
|
+
) : r.kind === 'added' ? (
|
|
267
|
+
<ins key={i} className="block">
|
|
268
|
+
{r.text || ' '}
|
|
269
|
+
</ins>
|
|
270
|
+
) : (
|
|
271
|
+
<div key={i}>{r.text || ' '}</div>
|
|
272
|
+
),
|
|
273
|
+
)}
|
|
274
|
+
</pre>
|
|
275
|
+
</div>
|
|
276
|
+
);
|
|
277
|
+
}
|