From d58eeea484ede20c1ff48b4e41a47ff07b66924b Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Mon, 9 Nov 2026 21:36:40 -0800 Subject: [PATCH] fix(folder-workspaces): match hook search to workspace descriptions --- .../repository/RepositoryPane.search.test.tsx | 50 +++++++++++++++++++ .../hooks/RepositoryHooksSection.tsx | 25 ++-------- .../repository-git-hooks-search-entries.ts | 37 +++++++++++--- 3 files changed, 82 insertions(+), 30 deletions(-) diff --git a/src/renderer/src/components/settings/repository/RepositoryPane.search.test.tsx b/src/renderer/src/components/settings/repository/RepositoryPane.search.test.tsx index 54efbcf0749..63d93760289 100644 --- a/src/renderer/src/components/settings/repository/RepositoryPane.search.test.tsx +++ b/src/renderer/src/components/settings/repository/RepositoryPane.search.test.tsx @@ -68,3 +68,53 @@ it('keeps a searched repository section editable when the query does not name th }) ) }) + +it.each([ + ['folder', 'new workspace', 'Setup script'], + ['folder', 'workspace is removed', 'Archive script'], + ['git', 'new worktree', 'Setup script'], + ['git', 'worktree is archived', 'Archive script'] +] as const)('finds editable %s hooks for %s', (kind, query, scriptLabel) => { + const repo: Repo = { + id: 'project-1', + path: '/tmp/sample-project', + displayName: 'Sample project', + badgeColor: '', + addedAt: 0, + ...(kind === 'folder' ? { kind: 'folder' as const } : {}) + } + const updateRepo = vi.fn() + useAppStore.setState({ + settings: getDefaultSettings('/tmp'), + settingsSearchQuery: query, + repos: [repo] + }) + render( + + + + ) + + const editor = screen.getByRole('textbox', { name: scriptLabel }) + fireEvent.change(editor, { target: { value: 'echo workspace-hook' } }) + fireEvent.blur(editor) + expect(updateRepo).toHaveBeenCalledWith( + 'project-1', + expect.objectContaining({ + hookSettings: expect.objectContaining({ + scripts: expect.objectContaining({ + [scriptLabel === 'Setup script' ? 'setup' : 'archive']: 'echo workspace-hook' + }) + }) + }), + expect.anything() + ) +}) diff --git a/src/renderer/src/components/settings/repository/hooks/RepositoryHooksSection.tsx b/src/renderer/src/components/settings/repository/hooks/RepositoryHooksSection.tsx index 378d640681a..991ddeac786 100644 --- a/src/renderer/src/components/settings/repository/hooks/RepositoryHooksSection.tsx +++ b/src/renderer/src/components/settings/repository/hooks/RepositoryHooksSection.tsx @@ -31,6 +31,7 @@ import { import { RepositoryIssueCommandSetting } from './RepositoryIssueCommandSetting' import { useRepositoryHookSettingsDraft } from './use-repository-hook-settings-draft' import { useRepositoryIssueCommand } from './use-repository-issue-command' +import { getRepositoryHookScriptDescription } from './repository-git-hooks-search-entries' type RepositoryHooksSectionProps = { repo: Repo @@ -126,17 +127,7 @@ export function RepositoryHooksSection({ >