From 2071e7be888ff727d4fe1f43d47d57aafae9c58a Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Sat, 24 Oct 2026 03:39:08 -0700 Subject: [PATCH] refactor(renderer): group GitHub task read and refresh owners (#33127) --- config/scripts/check-changed-code-quality.mjs | 2 +- config/scripts/ci-shard-timings.json | 10 +++++----- package.json | 2 +- .../gh-edit-section-mutations.ts | 2 +- .../land-pull-request/pr-actions-panel.tsx | 2 +- .../components/task-page-github-task-kind.ts | 7 ------- .../src/components/task-page/TaskPage.tsx | 18 ++++++++--------- .../src/components/task-page/github/List.tsx | 2 +- .../components/task-page/github/MergeCell.tsx | 2 +- .../task-page/github/ReviewCell.tsx | 4 ++-- ...ask-page-github-confirmed-client-values.ts | 6 +++--- ...page-github-dialog-state-authority.test.ts | 14 ++++++------- ...task-page-github-dialog-state-authority.ts | 12 +++++------ .../task-page-github-landing-refresh-run.tsx | 12 +++++------ ...sk-page-github-list-scroll-restore.test.ts | 0 .../task-page-github-list-scroll-restore.ts | 0 .../task-page-github-quiet-refresh-run.tsx | 10 +++++----- .../task-page-github-resume-cache.test.ts | 0 .../github}/task-page-github-resume-cache.ts | 2 +- .../github}/task-page-github-review-model.tsx | 8 ++++---- .../task-page-github-reviewer-actions.ts | 12 +++++------ ...k-page-github-reviewer-suggestions.test.ts | 0 .../task-page-github-task-kind.test.ts | 2 +- ...page-github-work-item-authority-refresh.ts | 2 +- ...e-github-work-item-mutation-composition.ts | 2 +- ...page-github-work-item-mutation-registry.ts | 2 +- ...hub-work-item-mutation-regressions.test.ts | 2 +- ...sk-page-github-work-item-mutations.test.ts | 2 +- .../task-page-github-work-item-quiet-adopt.ts | 2 +- ...e-task-page-github-cache-reconciliation.ts | 4 ++-- .../github}/use-task-page-github-detail.ts | 15 ++++++++------ .../use-task-page-github-issue-creation.ts | 4 ++-- .../use-task-page-github-issue-draft.ts | 8 ++++---- .../use-task-page-github-landing-refresh.ts | 0 .../use-task-page-github-list-projection.ts | 6 +++--- .../use-task-page-github-list-state.ts | 20 +++++++++++-------- ...e-task-page-github-quiet-refresh-effect.ts | 0 .../use-task-page-github-quiet-refresh.ts | 0 .../use-task-page-github-search-pagination.ts | 8 ++++---- .../use-task-page-linear-project-creation.ts | 2 +- .../use-task-page-detail-routing.ts | 2 +- .../use-task-page-jira-project-scope.test.tsx | 8 ++++---- .../use-task-page-resume-restoration.ts | 2 +- .../components/use-task-page-runtime-hosts.ts | 5 ++--- .../use-task-page-search-actions.ts | 4 ++-- 45 files changed, 114 insertions(+), 115 deletions(-) delete mode 100644 src/renderer/src/components/task-page-github-task-kind.ts rename src/renderer/src/components/{ => task-page/github}/task-page-github-confirmed-client-values.ts (84%) rename src/renderer/src/components/{ => task-page/github}/task-page-github-dialog-state-authority.test.ts (93%) rename src/renderer/src/components/{ => task-page/github}/task-page-github-dialog-state-authority.ts (83%) rename src/renderer/src/components/{ => task-page/github}/task-page-github-landing-refresh-run.tsx (97%) rename src/renderer/src/components/{ => task-page/github}/task-page-github-list-scroll-restore.test.ts (100%) rename src/renderer/src/components/{ => task-page/github}/task-page-github-list-scroll-restore.ts (100%) rename src/renderer/src/components/{ => task-page/github}/task-page-github-quiet-refresh-run.tsx (97%) rename src/renderer/src/components/{ => task-page/github}/task-page-github-resume-cache.test.ts (100%) rename src/renderer/src/components/{ => task-page/github}/task-page-github-resume-cache.ts (96%) rename src/renderer/src/components/{ => task-page/github}/task-page-github-review-model.tsx (88%) rename src/renderer/src/components/{ => task-page/github}/task-page-github-reviewer-actions.ts (94%) rename src/renderer/src/components/{ => task-page/github}/task-page-github-reviewer-suggestions.test.ts (100%) rename src/renderer/src/components/{ => task-page/github}/task-page-github-task-kind.test.ts (99%) rename src/renderer/src/components/{ => task-page/github}/use-task-page-github-cache-reconciliation.ts (97%) rename src/renderer/src/components/{ => task-page/github}/use-task-page-github-detail.ts (95%) rename src/renderer/src/components/{ => task-page/github}/use-task-page-github-issue-creation.ts (97%) rename src/renderer/src/components/{ => task-page/github}/use-task-page-github-issue-draft.ts (95%) rename src/renderer/src/components/{ => task-page/github}/use-task-page-github-landing-refresh.ts (100%) rename src/renderer/src/components/{ => task-page/github}/use-task-page-github-list-projection.ts (97%) rename src/renderer/src/components/{ => task-page/github}/use-task-page-github-list-state.ts (95%) rename src/renderer/src/components/{ => task-page/github}/use-task-page-github-quiet-refresh-effect.ts (100%) rename src/renderer/src/components/{ => task-page/github}/use-task-page-github-quiet-refresh.ts (100%) rename src/renderer/src/components/{ => task-page/github}/use-task-page-github-search-pagination.ts (96%) diff --git a/config/scripts/check-changed-code-quality.mjs b/config/scripts/check-changed-code-quality.mjs index ae05af67a48..a796c1df165 100644 --- a/config/scripts/check-changed-code-quality.mjs +++ b/config/scripts/check-changed-code-quality.mjs @@ -64,7 +64,7 @@ const SUPPRESSED_REACT_DOCTOR_DIAGNOSTICS = new Map([ [ 'react-doctor(no-adjust-state-on-prop-change)', new Set([ - 'src/renderer/src/components/use-task-page-github-issue-draft.ts', + 'src/renderer/src/components/task-page/github/use-task-page-github-issue-draft.ts', 'src/renderer/src/components/use-task-page-jira-creation-state.ts' ]) ], diff --git a/config/scripts/ci-shard-timings.json b/config/scripts/ci-shard-timings.json index 9e16b2cb751..553df28dc02 100644 --- a/config/scripts/ci-shard-timings.json +++ b/config/scripts/ci-shard-timings.json @@ -8721,13 +8721,13 @@ "src/renderer/src/components/task-page-checks-pill.test.ts": 39, "src/renderer/src/components/task-page/task-page-default-repo-selection.test.ts": 54, "src/renderer/src/components/task-page-empty-state.test.ts": 62, - "src/renderer/src/components/task-page-github-dialog-state-authority.test.ts": 67, - "src/renderer/src/components/task-page-github-list-scroll-restore.test.ts": 163, - "src/renderer/src/components/task-page-github-resume-cache.test.ts": 39, - "src/renderer/src/components/task-page-github-reviewer-suggestions.test.ts": 78, + "src/renderer/src/components/task-page/github/task-page-github-dialog-state-authority.test.ts": 67, + "src/renderer/src/components/task-page/github/task-page-github-list-scroll-restore.test.ts": 163, + "src/renderer/src/components/task-page/github/task-page-github-resume-cache.test.ts": 39, + "src/renderer/src/components/task-page/github/task-page-github-reviewer-suggestions.test.ts": 78, "src/renderer/src/components/task-page/github/task-page-github-status-actions.test.ts": 35, "src/renderer/src/components/task-page/github/task-page-github-status-state.test.ts": 33, - "src/renderer/src/components/task-page-github-task-kind.test.ts": 61, + "src/renderer/src/components/task-page/github/task-page-github-task-kind.test.ts": 61, "src/renderer/src/components/task-page/github/task-page-github-work-item-filter-membership.test.ts": 31, "src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-patches.test.ts": 44, "src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-regressions.test.ts": 96, diff --git a/package.json b/package.json index 7575a90a817..020559b3a99 100644 --- a/package.json +++ b/package.json @@ -382,7 +382,7 @@ }, { "files": [ - "src/renderer/src/components/use-task-page-github-issue-draft.ts", + "src/renderer/src/components/task-page/github/use-task-page-github-issue-draft.ts", "src/renderer/src/components/use-task-page-jira-creation-state.ts" ], "rules": [ diff --git a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-mutations.ts b/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-mutations.ts index 4164fd377c3..d0c0ed0c076 100644 --- a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-mutations.ts +++ b/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-mutations.ts @@ -7,7 +7,7 @@ import { validateTaskPageGitHubDuplicateTarget, type TaskPageGitHubCloseAction } from '@/components/task-page/github/task-page-github-status-actions' -import { assertTaskPageGitHubDialogStateAuthority } from '@/components/task-page-github-dialog-state-authority' +import { assertTaskPageGitHubDialogStateAuthority } from '@/components/task-page/github/task-page-github-dialog-state-authority' import { runIssueUpdate } from '@/components/github/github-work-item-edit-mutations' import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types' import type { GitHubOwnerRepo } from '../../../../../shared/github/pull-request-types' diff --git a/src/renderer/src/components/github-item-dialog/land-pull-request/pr-actions-panel.tsx b/src/renderer/src/components/github-item-dialog/land-pull-request/pr-actions-panel.tsx index fb25c145130..9d5b1d15d69 100644 --- a/src/renderer/src/components/github-item-dialog/land-pull-request/pr-actions-panel.tsx +++ b/src/renderer/src/components/github-item-dialog/land-pull-request/pr-actions-panel.tsx @@ -20,7 +20,7 @@ import type { GitHubPRMergeMethod } from '../../../../../shared/github/pull-requ import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types' import type { TaskSourceContext } from '../../../../../shared/task-source-context' import { translate } from '@/i18n/i18n' -import { assertTaskPageGitHubDialogStateAuthority } from '@/components/task-page-github-dialog-state-authority' +import { assertTaskPageGitHubDialogStateAuthority } from '@/components/task-page/github/task-page-github-dialog-state-authority' import { resolvePullRequestRepo } from '@/components/github/github-work-item-identity' import { notifyWorkItemDetailsMutation } from '@/components/github/github-work-item-comment-mutations' import { runPullRequestStateUpdate } from '@/components/github/github-work-item-edit-mutations' diff --git a/src/renderer/src/components/task-page-github-task-kind.ts b/src/renderer/src/components/task-page-github-task-kind.ts deleted file mode 100644 index c540cb303bd..00000000000 --- a/src/renderer/src/components/task-page-github-task-kind.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { - getDefaultPresetForGitHubTaskKind, - getGitHubTaskKind, - isPRFocusedTaskView, - normalizeGitHubTaskPreset, - scopeGitHubTaskSearch -} from '../../../shared/task-github-search' diff --git a/src/renderer/src/components/task-page/TaskPage.tsx b/src/renderer/src/components/task-page/TaskPage.tsx index c5da4c17154..7628ac461d2 100644 --- a/src/renderer/src/components/task-page/TaskPage.tsx +++ b/src/renderer/src/components/task-page/TaskPage.tsx @@ -4,10 +4,10 @@ import { useTaskPageRepoSelection } from '../use-task-page-repo-selection' import { useTaskPageRuntimeHosts } from '../use-task-page-runtime-hosts' import { useTaskPageSourceAvailability } from '../use-task-page-source-availability' import { useTaskPageProviderState } from '../use-task-page-provider-state' -import { useTaskPageGitHubListState } from '../use-task-page-github-list-state' -import { useTaskPageGitHubDetail } from '../use-task-page-github-detail' -import { useTaskPageGitHubCacheReconciliation } from '../use-task-page-github-cache-reconciliation' -import { useTaskPageGitHubIssueDraft } from '../use-task-page-github-issue-draft' +import { useTaskPageGitHubListState } from './github/use-task-page-github-list-state' +import { useTaskPageGitHubDetail } from './github/use-task-page-github-detail' +import { useTaskPageGitHubCacheReconciliation } from './github/use-task-page-github-cache-reconciliation' +import { useTaskPageGitHubIssueDraft } from './github/use-task-page-github-issue-draft' import { useTaskPageDetailRouting } from '../use-task-page-detail-routing' import { useTaskPageLinearViewState } from './linear/use-task-page-linear-view-state' import { useTaskPageJiraListState } from '../use-task-page-jira-list-state' @@ -22,13 +22,13 @@ import { useTaskPageLinearCreationState } from './linear/use-task-page-linear-cr import { useTaskPageGitHubMutationState } from './github/use-task-page-github-mutation-state' import { useTaskPageJiraCreationState } from '../use-task-page-jira-creation-state' import { useTaskPageJiraCreationMetadata } from '../use-task-page-jira-creation-metadata' -import { useTaskPageGitHubListProjection } from '../use-task-page-github-list-projection' -import { useTaskPageGitHubSearchPagination } from '../use-task-page-github-search-pagination' -import { useTaskPageGitHubLandingRefresh } from '../use-task-page-github-landing-refresh' -import { useTaskPageGitHubQuietRefresh } from '../use-task-page-github-quiet-refresh' +import { useTaskPageGitHubListProjection } from './github/use-task-page-github-list-projection' +import { useTaskPageGitHubSearchPagination } from './github/use-task-page-github-search-pagination' +import { useTaskPageGitHubLandingRefresh } from './github/use-task-page-github-landing-refresh' +import { useTaskPageGitHubQuietRefresh } from './github/use-task-page-github-quiet-refresh' import { useTaskPageSearchActions } from '../use-task-page-search-actions' import { useTaskPageWorkspaceActions } from '../use-task-page-workspace-actions' -import { useTaskPageGitHubIssueCreation } from '../use-task-page-github-issue-creation' +import { useTaskPageGitHubIssueCreation } from './github/use-task-page-github-issue-creation' import { useTaskPageLinearProjectCreation } from './linear/use-task-page-linear-project-creation' import { useTaskPageLinearIssueCreation } from './linear/use-task-page-linear-issue-creation' import { useTaskPageJiraIssueCreation } from '../use-task-page-jira-issue-creation' diff --git a/src/renderer/src/components/task-page/github/List.tsx b/src/renderer/src/components/task-page/github/List.tsx index 67b911c87ea..4e14f32de13 100644 --- a/src/renderer/src/components/task-page/github/List.tsx +++ b/src/renderer/src/components/task-page/github/List.tsx @@ -13,7 +13,7 @@ import { Button } from '@/components/ui/button' import { LoaderCircle } from 'lucide-react' import { TaskPageGitHubRows } from './Rows' import { PaginationBar } from '../PaginationBar' -import { supersedeGitHubListScrollRestore } from '../../task-page-github-list-scroll-restore' +import { supersedeGitHubListScrollRestore } from './task-page-github-list-scroll-restore' export function TaskPageGitHubList({ model }: { diff --git a/src/renderer/src/components/task-page/github/MergeCell.tsx b/src/renderer/src/components/task-page/github/MergeCell.tsx index 477745f2ac4..f190b0e4159 100644 --- a/src/renderer/src/components/task-page/github/MergeCell.tsx +++ b/src/renderer/src/components/task-page/github/MergeCell.tsx @@ -25,7 +25,7 @@ import { Tooltip, TooltipTrigger, TooltipContent } from '@/components/ui/tooltip import { cn } from '@/lib/utils' import { LoaderCircle, GitMerge, ChevronDown, ExternalLink } from 'lucide-react' import type { TaskPageGitHubWorkItemMutationRunner } from '../linear/task-page-linear-jira-list-model' -import { resolveTaskPullRequestRepo } from '../../task-page-github-review-model' +import { resolveTaskPullRequestRepo } from './task-page-github-review-model' export function PRMergeCell({ item, repo, diff --git a/src/renderer/src/components/task-page/github/ReviewCell.tsx b/src/renderer/src/components/task-page/github/ReviewCell.tsx index 06ff5b6d6ff..8ff7ccd77b9 100644 --- a/src/renderer/src/components/task-page/github/ReviewCell.tsx +++ b/src/renderer/src/components/task-page/github/ReviewCell.tsx @@ -24,9 +24,9 @@ import type { TaskPageGitHubWorkItemMutationRunner } from '../linear/task-page-l import { mergeReviewerSuggestions, resolveTaskPullRequestRepo -} from '../../task-page-github-review-model' +} from './task-page-github-review-model' import { ReviewChipAvatar } from './Avatars' -import { createTaskPageGitHubReviewerActions } from '../../task-page-github-reviewer-actions' +import { createTaskPageGitHubReviewerActions } from './task-page-github-reviewer-actions' import { TaskPageGitHubReviewerPicker } from './ReviewerPicker' export function PRReviewCell({ item, diff --git a/src/renderer/src/components/task-page-github-confirmed-client-values.ts b/src/renderer/src/components/task-page/github/task-page-github-confirmed-client-values.ts similarity index 84% rename from src/renderer/src/components/task-page-github-confirmed-client-values.ts rename to src/renderer/src/components/task-page/github/task-page-github-confirmed-client-values.ts index 82a570912f2..877916e6b35 100644 --- a/src/renderer/src/components/task-page-github-confirmed-client-values.ts +++ b/src/renderer/src/components/task-page/github/task-page-github-confirmed-client-values.ts @@ -1,6 +1,6 @@ -import type { GitHubOwnerRepo } from '../../../shared/github/pull-request-types' -import { githubRepoIdentityKey } from '../../../shared/github/repository-identity-key' -import { taskPageGitHubLastConfirmedKey } from './task-page/github/task-page-github-work-item-mutation-keys' +import type { GitHubOwnerRepo } from '../../../../../shared/github/pull-request-types' +import { githubRepoIdentityKey } from '../../../../../shared/github/repository-identity-key' +import { taskPageGitHubLastConfirmedKey } from './task-page-github-work-item-mutation-keys' const lastConfirmedClientValues = new Map< string, diff --git a/src/renderer/src/components/task-page-github-dialog-state-authority.test.ts b/src/renderer/src/components/task-page/github/task-page-github-dialog-state-authority.test.ts similarity index 93% rename from src/renderer/src/components/task-page-github-dialog-state-authority.test.ts rename to src/renderer/src/components/task-page/github/task-page-github-dialog-state-authority.test.ts index d177d5869d1..9c24a4a495f 100644 --- a/src/renderer/src/components/task-page-github-dialog-state-authority.test.ts +++ b/src/renderer/src/components/task-page/github/task-page-github-dialog-state-authority.test.ts @@ -1,27 +1,27 @@ import { afterEach, describe, expect, it } from 'vitest' -import type { GitHubWorkItem } from '../../../shared/github/work-item-types' -import { getTaskSourceCacheScope } from '../../../shared/task-source-context' +import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types' +import { getTaskSourceCacheScope } from '../../../../../shared/task-source-context' import { assertTaskPageGitHubDialogStateAuthority } from './task-page-github-dialog-state-authority' -import { adoptQuietSearchFieldsForItem } from './task-page/github/task-page-github-work-item-quiet-adopt' +import { adoptQuietSearchFieldsForItem } from './task-page-github-work-item-quiet-adopt' import { applyPendingTaskPageGitHubMutationsToItems, materializeTaskPageItemList, reapplyPendingTaskPageGitHubMutationsToCache -} from './task-page/github/task-page-github-work-item-mutation-pages' +} from './task-page-github-work-item-mutation-pages' import { deleteLastConfirmedClientValue, getLastConfirmedClientValue } from './task-page-github-confirmed-client-values' -import { getOrCreateQuietRevalidateState } from './task-page/github/task-page-github-work-item-quiet-state' +import { getOrCreateQuietRevalidateState } from './task-page-github-work-item-quiet-state' import { resetTaskPageGitHubMutationRegistryForTests, setLastConfirmedClientValue, setTaskPageGitHubMutationQueryKey -} from './task-page/github/task-page-github-work-item-mutation-registry' +} from './task-page-github-work-item-mutation-registry' import { taskPageGitHubFamilyDirtyKey, taskPageGitHubItemKey -} from './task-page/github/task-page-github-work-item-mutation-keys' +} from './task-page-github-work-item-mutation-keys' function item(overrides: Partial = {}): GitHubWorkItem { return { diff --git a/src/renderer/src/components/task-page-github-dialog-state-authority.ts b/src/renderer/src/components/task-page/github/task-page-github-dialog-state-authority.ts similarity index 83% rename from src/renderer/src/components/task-page-github-dialog-state-authority.ts rename to src/renderer/src/components/task-page/github/task-page-github-dialog-state-authority.ts index ddc1094cd06..89c5745d32a 100644 --- a/src/renderer/src/components/task-page-github-dialog-state-authority.ts +++ b/src/renderer/src/components/task-page/github/task-page-github-dialog-state-authority.ts @@ -1,9 +1,9 @@ -import type { GitHubWorkItem } from '../../../shared/github/work-item-types' -import type { GitHubOwnerRepo } from '../../../shared/github/pull-request-types' +import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types' +import type { GitHubOwnerRepo } from '../../../../../shared/github/pull-request-types' import { getTaskSourceCacheScope, type TaskSourceContext -} from '../../../shared/task-source-context' +} from '../../../../../shared/task-source-context' import { deleteLastConfirmedClientValue, getLastConfirmedClientValue @@ -12,9 +12,9 @@ import { getTaskPageGitHubMutationQueryKey, notifyTaskPageGitHubMutationRegistry, setLastConfirmedClientValue -} from './task-page/github/task-page-github-work-item-mutation-registry' -import { markTaskPageGitHubFamiliesDirty } from './task-page/github/task-page-github-work-item-quiet-state' -import { taskPageGitHubItemKey } from './task-page/github/task-page-github-work-item-mutation-keys' +} from './task-page-github-work-item-mutation-registry' +import { markTaskPageGitHubFamiliesDirty } from './task-page-github-work-item-quiet-state' +import { taskPageGitHubItemKey } from './task-page-github-work-item-mutation-keys' function markStateFamilyDirty(repoId: string, itemId: string): void { const queryKey = getTaskPageGitHubMutationQueryKey() diff --git a/src/renderer/src/components/task-page-github-landing-refresh-run.tsx b/src/renderer/src/components/task-page/github/task-page-github-landing-refresh-run.tsx similarity index 97% rename from src/renderer/src/components/task-page-github-landing-refresh-run.tsx rename to src/renderer/src/components/task-page/github/task-page-github-landing-refresh-run.tsx index 9c56b2c0732..674129b8656 100644 --- a/src/renderer/src/components/task-page-github-landing-refresh-run.tsx +++ b/src/renderer/src/components/task-page/github/task-page-github-landing-refresh-run.tsx @@ -1,13 +1,13 @@ import type { TaskPageGitHubSearchPaginationModel } from './use-task-page-github-search-pagination' -import { stripRepoQualifiers } from '../../../shared/task-query' -import { useAppStore } from '@/store' +import { stripRepoQualifiers } from '../../../../../shared/task-query' +import { useAppStore } from '@/store/index' import { taskPageGitHubResumeCache, TASK_PAGE_GITHUB_RESUME_FRESH_MS -} from '@/components/task-page-github-resume-cache' -import type { GitHubWorkItem } from '../../../shared/github/work-item-types' -import { getTaskPageRepoSourceContext } from './task-page-source-context' -import { sortWorkItemsByNumber, taskPageToGitHubApiPage } from '../../../shared/work-items' +} from '@/components/task-page/github/task-page-github-resume-cache' +import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types' +import { getTaskPageRepoSourceContext } from '../../task-page-source-context' +import { sortWorkItemsByNumber, taskPageToGitHubApiPage } from '../../../../../shared/work-items' import { materializeTaskPageItemList, overlayPendingOnTaskPagePages, diff --git a/src/renderer/src/components/task-page-github-list-scroll-restore.test.ts b/src/renderer/src/components/task-page/github/task-page-github-list-scroll-restore.test.ts similarity index 100% rename from src/renderer/src/components/task-page-github-list-scroll-restore.test.ts rename to src/renderer/src/components/task-page/github/task-page-github-list-scroll-restore.test.ts diff --git a/src/renderer/src/components/task-page-github-list-scroll-restore.ts b/src/renderer/src/components/task-page/github/task-page-github-list-scroll-restore.ts similarity index 100% rename from src/renderer/src/components/task-page-github-list-scroll-restore.ts rename to src/renderer/src/components/task-page/github/task-page-github-list-scroll-restore.ts diff --git a/src/renderer/src/components/task-page-github-quiet-refresh-run.tsx b/src/renderer/src/components/task-page/github/task-page-github-quiet-refresh-run.tsx similarity index 97% rename from src/renderer/src/components/task-page-github-quiet-refresh-run.tsx rename to src/renderer/src/components/task-page/github/task-page-github-quiet-refresh-run.tsx index ddcb40a4936..df44b4b6975 100644 --- a/src/renderer/src/components/task-page-github-quiet-refresh-run.tsx +++ b/src/renderer/src/components/task-page/github/task-page-github-quiet-refresh-run.tsx @@ -25,11 +25,11 @@ import { MAX_LAG_TRAILS, LAG_BACKOFF_MS } from '@/components/task-page/github/task-page-github-work-item-quiet-adopt' -import { stripRepoQualifiers } from '../../../shared/task-query' -import { getTaskPageRepoSourceContext } from './task-page-source-context' -import type { GitHubWorkItem } from '../../../shared/github/work-item-types' -import { taskPageToGitHubApiPage } from '../../../shared/work-items' -import { useAppStore } from '@/store' +import { stripRepoQualifiers } from '../../../../../shared/task-query' +import { getTaskPageRepoSourceContext } from '../../task-page-source-context' +import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types' +import { taskPageToGitHubApiPage } from '../../../../../shared/work-items' +import { useAppStore } from '@/store/index' export function runTaskPageGitHubQuietRefresh(model: TaskPageGitHubQuietRefreshPreludeModel) { const { fetchWorkItemsAcrossRepos, diff --git a/src/renderer/src/components/task-page-github-resume-cache.test.ts b/src/renderer/src/components/task-page/github/task-page-github-resume-cache.test.ts similarity index 100% rename from src/renderer/src/components/task-page-github-resume-cache.test.ts rename to src/renderer/src/components/task-page/github/task-page-github-resume-cache.test.ts diff --git a/src/renderer/src/components/task-page-github-resume-cache.ts b/src/renderer/src/components/task-page/github/task-page-github-resume-cache.ts similarity index 96% rename from src/renderer/src/components/task-page-github-resume-cache.ts rename to src/renderer/src/components/task-page/github/task-page-github-resume-cache.ts index 8cd4d14b029..d8713230c34 100644 --- a/src/renderer/src/components/task-page-github-resume-cache.ts +++ b/src/renderer/src/components/task-page/github/task-page-github-resume-cache.ts @@ -1,4 +1,4 @@ -import type { GitHubWorkItem } from '../../../shared/github/work-item-types' +import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types' export const TASK_PAGE_GITHUB_RESUME_CACHE_LIMIT = 5 export const TASK_PAGE_GITHUB_RESUME_CACHE_TTL_MS = 10 * 60_000 diff --git a/src/renderer/src/components/task-page-github-review-model.tsx b/src/renderer/src/components/task-page/github/task-page-github-review-model.tsx similarity index 88% rename from src/renderer/src/components/task-page-github-review-model.tsx rename to src/renderer/src/components/task-page/github/task-page-github-review-model.tsx index db4b9e4c5ce..8a3a5aea8c4 100644 --- a/src/renderer/src/components/task-page-github-review-model.tsx +++ b/src/renderer/src/components/task-page/github/task-page-github-review-model.tsx @@ -1,11 +1,11 @@ import type { GitHubOwnerRepo, GitHubAssignableUser -} from '../../../shared/github/pull-request-types' -import type { GitHubWorkItem } from '../../../shared/github/work-item-types' +} from '../../../../../shared/github/pull-request-types' +import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types' import { sameGitHubOwnerRepo } from '@/components/github/IssueSourceIndicator' -import { parseGitHubIssueOrPRLink } from '@/lib/github-links' -import { githubProjectHost } from '../../../shared/github/project-identity' +import { parseGitHubIssueOrPRLink } from '../../../../../shared/github/links' +import { githubProjectHost } from '../../../../../shared/github/project-identity' export function sameOptionalGitHubOwnerRepo( left: GitHubOwnerRepo | null | undefined, right: GitHubOwnerRepo | null | undefined diff --git a/src/renderer/src/components/task-page-github-reviewer-actions.ts b/src/renderer/src/components/task-page/github/task-page-github-reviewer-actions.ts similarity index 94% rename from src/renderer/src/components/task-page-github-reviewer-actions.ts rename to src/renderer/src/components/task-page/github/task-page-github-reviewer-actions.ts index 00c4e5b69a8..83f9b3f1ffd 100644 --- a/src/renderer/src/components/task-page-github-reviewer-actions.ts +++ b/src/renderer/src/components/task-page/github/task-page-github-reviewer-actions.ts @@ -2,7 +2,7 @@ import type { Dispatch, SetStateAction } from 'react' import { translate } from '@/i18n/i18n' import { callRuntimeRpc } from '@/runtime/runtime-rpc-client' -import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' +import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target' import type { TaskPageGitHubMutationIntent } from '@/components/task-page/github/task-page-github-work-item-mutation-patches' import { normalizeGitHubReviewerLogins, @@ -13,11 +13,11 @@ import { toast } from 'sonner' import type { GitHubAssignableUser, GitHubOwnerRepo -} from '../../../shared/github/pull-request-types' -import type { GitHubWorkItem } from '../../../shared/github/work-item-types' -import type { Repo } from '../../../shared/repo-types' -import type { TaskSourceContext } from '../../../shared/task-source-context' -import type { TaskPageGitHubWorkItemMutationRunner } from './task-page/linear/task-page-linear-jira-list-model' +} from '../../../../../shared/github/pull-request-types' +import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types' +import type { Repo } from '../../../../../shared/repo-types' +import type { TaskSourceContext } from '../../../../../shared/task-source-context' +import type { TaskPageGitHubWorkItemMutationRunner } from '../linear/task-page-linear-jira-list-model' import { buildRequestedReviewUsers } from './task-page-github-review-model' type ReviewerActionsInput = { diff --git a/src/renderer/src/components/task-page-github-reviewer-suggestions.test.ts b/src/renderer/src/components/task-page/github/task-page-github-reviewer-suggestions.test.ts similarity index 100% rename from src/renderer/src/components/task-page-github-reviewer-suggestions.test.ts rename to src/renderer/src/components/task-page/github/task-page-github-reviewer-suggestions.test.ts diff --git a/src/renderer/src/components/task-page-github-task-kind.test.ts b/src/renderer/src/components/task-page/github/task-page-github-task-kind.test.ts similarity index 99% rename from src/renderer/src/components/task-page-github-task-kind.test.ts rename to src/renderer/src/components/task-page/github/task-page-github-task-kind.test.ts index cd56ef3e87b..75b4b15995e 100644 --- a/src/renderer/src/components/task-page-github-task-kind.test.ts +++ b/src/renderer/src/components/task-page/github/task-page-github-task-kind.test.ts @@ -6,7 +6,7 @@ import { isPRFocusedTaskView, normalizeGitHubTaskPreset, scopeGitHubTaskSearch -} from './task-page-github-task-kind' +} from '../../../../../shared/task-github-search' describe('isPRFocusedTaskView', () => { const presetCases = [ diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-authority-refresh.ts b/src/renderer/src/components/task-page/github/task-page-github-work-item-authority-refresh.ts index 93cb8cc7240..fcde70a7fe9 100644 --- a/src/renderer/src/components/task-page/github/task-page-github-work-item-authority-refresh.ts +++ b/src/renderer/src/components/task-page/github/task-page-github-work-item-authority-refresh.ts @@ -15,7 +15,7 @@ import { import { deleteLastConfirmedClientValue, getLastConfirmedClientValue -} from '../../task-page-github-confirmed-client-values' +} from './task-page-github-confirmed-client-values' import { getQuietRevalidateState } from './task-page-github-work-item-quiet-state' import { MAX_LAG_TRAILS } from './task-page-github-work-item-quiet-adopt' diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-composition.ts b/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-composition.ts index b73b8f87bf2..1b696494349 100644 --- a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-composition.ts +++ b/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-composition.ts @@ -20,7 +20,7 @@ import { setStickyHideEntry, updateSoftHiddenItemKey } from './task-page-github-work-item-mutation-registry' -import { getLastConfirmedClientValue } from '../../task-page-github-confirmed-client-values' +import { getLastConfirmedClientValue } from './task-page-github-confirmed-client-values' import { taskPageGitHubItemKey } from './task-page-github-work-item-mutation-keys' import type { PendingListOp, diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-registry.ts b/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-registry.ts index 0c96ca611dc..e2187041177 100644 --- a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-registry.ts +++ b/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-registry.ts @@ -3,7 +3,7 @@ import { deleteLastConfirmedClientValue, getLastConfirmedClientValue, setLastConfirmedClientValue as storeLastConfirmedClientValue -} from '../../task-page-github-confirmed-client-values' +} from './task-page-github-confirmed-client-values' import type { GitHubAssignableUser, GitHubOwnerRepo diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-regressions.test.ts b/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-regressions.test.ts index c8d94f6e1d3..251773480cf 100644 --- a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-regressions.test.ts +++ b/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-regressions.test.ts @@ -27,7 +27,7 @@ import { getTaskPageGitHubRevalidatableAuthorityItemKeys } from './task-page-github-work-item-authority-refresh' import { confirmTaskPageGitHubWorkItemMutation } from './task-page-github-work-item-mutation-lifecycle' -import { getLastConfirmedClientValue } from '../../task-page-github-confirmed-client-values' +import { getLastConfirmedClientValue } from './task-page-github-confirmed-client-values' import { getOrCreateQuietRevalidateState, beginTaskPageQuietRevalidateRun, diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutations.test.ts b/src/renderer/src/components/task-page/github/task-page-github-work-item-mutations.test.ts index cb1f6e85f8c..064db360149 100644 --- a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutations.test.ts +++ b/src/renderer/src/components/task-page/github/task-page-github-work-item-mutations.test.ts @@ -24,7 +24,7 @@ import { getTaskPageGitHubSoftHiddenItemKeys, resetTaskPageGitHubMutationRegistryForTests } from './task-page-github-work-item-mutation-registry' -import { getLastConfirmedClientValue } from '../../task-page-github-confirmed-client-values' +import { getLastConfirmedClientValue } from './task-page-github-confirmed-client-values' import { getOrCreateQuietRevalidateState } from './task-page-github-work-item-quiet-state' import { taskPageGitHubItemKey } from './task-page-github-work-item-mutation-keys' diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-quiet-adopt.ts b/src/renderer/src/components/task-page/github/task-page-github-work-item-quiet-adopt.ts index 6cd99bb6897..9743ed91211 100644 --- a/src/renderer/src/components/task-page/github/task-page-github-work-item-quiet-adopt.ts +++ b/src/renderer/src/components/task-page/github/task-page-github-work-item-quiet-adopt.ts @@ -14,7 +14,7 @@ import { import { getLastConfirmedClientValue, deleteLastConfirmedClientValue -} from '../../task-page-github-confirmed-client-values' +} from './task-page-github-confirmed-client-values' import { getOrCreateQuietRevalidateState } from './task-page-github-work-item-quiet-state' import { taskPageGitHubFamilyDirtyKey, diff --git a/src/renderer/src/components/use-task-page-github-cache-reconciliation.ts b/src/renderer/src/components/task-page/github/use-task-page-github-cache-reconciliation.ts similarity index 97% rename from src/renderer/src/components/use-task-page-github-cache-reconciliation.ts rename to src/renderer/src/components/task-page/github/use-task-page-github-cache-reconciliation.ts index 7ae46d3fd16..bde96ef0050 100644 --- a/src/renderer/src/components/use-task-page-github-cache-reconciliation.ts +++ b/src/renderer/src/components/task-page/github/use-task-page-github-cache-reconciliation.ts @@ -1,7 +1,7 @@ import type { TaskPageGitHubDetailModel } from './use-task-page-github-detail' import { useCallback, useMemo, useEffect, useRef, useState } from 'react' -import type { GitHubWorkItem } from '../../../shared/github/work-item-types' -import type { GitHubAssignableUser } from '../../../shared/github/pull-request-types' +import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types' +import type { GitHubAssignableUser } from '../../../../../shared/github/pull-request-types' import { patchTaskPageGitHubWorkItemPages, overlayPendingOnTaskPagePages diff --git a/src/renderer/src/components/use-task-page-github-detail.ts b/src/renderer/src/components/task-page/github/use-task-page-github-detail.ts similarity index 95% rename from src/renderer/src/components/use-task-page-github-detail.ts rename to src/renderer/src/components/task-page/github/use-task-page-github-detail.ts index 86c348378c9..ac8473352b0 100644 --- a/src/renderer/src/components/use-task-page-github-detail.ts +++ b/src/renderer/src/components/task-page/github/use-task-page-github-detail.ts @@ -1,17 +1,20 @@ import type { TaskPageGitHubListStateModel } from './use-task-page-github-list-state' -import { useAppStore } from '@/store' +import { useAppStore } from '@/store/index' import { getWorkItemRepo } from '@/lib/work-item-repo-row' import { useState, useMemo, useLayoutEffect, useCallback, useEffect } from 'react' -import type { ItemDialogTab } from '@/components/GitHubItemDialog' -import { stripRepoQualifiers } from '../../../shared/task-query' +import type { ItemDialogTab } from '@/components/github/github-work-item-identity' +import { stripRepoQualifiers } from '../../../../../shared/task-query' import { useShallow } from 'zustand/react/shallow' import { selectTaskPageWorkItemsCacheEntries, findTaskPageDialogWorkItem } from '@/components/task-page-cache-selectors' -import type { GitHubWorkItem } from '../../../shared/github/work-item-types' -import type { GitLabWorkItem } from '../../../shared/gitlab-types' -import { getTaskPageRepoCacheInput, getTaskPageRepoSourceContext } from './task-page-source-context' +import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types' +import type { GitLabWorkItem } from '../../../../../shared/gitlab-types' +import { + getTaskPageRepoCacheInput, + getTaskPageRepoSourceContext +} from '../../task-page-source-context' import { startGitHubListScrollRestore } from './task-page-github-list-scroll-restore' function getTaskPageScrollTop( diff --git a/src/renderer/src/components/use-task-page-github-issue-creation.ts b/src/renderer/src/components/task-page/github/use-task-page-github-issue-creation.ts similarity index 97% rename from src/renderer/src/components/use-task-page-github-issue-creation.ts rename to src/renderer/src/components/task-page/github/use-task-page-github-issue-creation.ts index e89d3e0374a..de91b438aa3 100644 --- a/src/renderer/src/components/use-task-page-github-issue-creation.ts +++ b/src/renderer/src/components/task-page/github/use-task-page-github-issue-creation.ts @@ -1,9 +1,9 @@ -import type { TaskPageWorkspaceActionsModel } from './use-task-page-workspace-actions' +import type { TaskPageWorkspaceActionsModel } from '../../use-task-page-workspace-actions' import { useCallback } from 'react' import { callRuntimeRpc } from '@/runtime/runtime-rpc-client' import { toast } from 'sonner' import { translate } from '@/i18n/i18n' -import type { GitHubWorkItem } from '../../../shared/github/work-item-types' +import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types' export function useTaskPageGitHubIssueCreation(model: TaskPageWorkspaceActionsModel) { const { setTaskRefreshNonce, diff --git a/src/renderer/src/components/use-task-page-github-issue-draft.ts b/src/renderer/src/components/task-page/github/use-task-page-github-issue-draft.ts similarity index 95% rename from src/renderer/src/components/use-task-page-github-issue-draft.ts rename to src/renderer/src/components/task-page/github/use-task-page-github-issue-draft.ts index 3748e19d58a..23e5743da82 100644 --- a/src/renderer/src/components/use-task-page-github-issue-draft.ts +++ b/src/renderer/src/components/task-page/github/use-task-page-github-issue-draft.ts @@ -1,14 +1,14 @@ import type { TaskPageGitHubCacheReconciliationModel } from './use-task-page-github-cache-reconciliation' import { useState, useMemo, useEffect } from 'react' -import type { GitHubAssignableUser } from '../../../shared/github/pull-request-types' -import { useAppStore } from '@/store' +import type { GitHubAssignableUser } from '../../../../../shared/github/pull-request-types' +import { useAppStore } from '@/store/index' import { getGitHubRepoRoutingTarget } from '@/lib/github-source-runtime-context' -import { useRepoLabels, useRepoAssignees } from '@/hooks/useIssueMetadata' +import { useRepoLabels, useRepoAssignees } from '@/hooks/useGitHubRepoMetadata' import { resolveVanishedNewIssueRepoReset, isNewIssueDraftContentful } from '@/components/task-page-new-issue-draft' -import { getTaskPageRepoSourceContext } from './task-page-source-context' +import { getTaskPageRepoSourceContext } from '../../task-page-source-context' export function useTaskPageGitHubIssueDraft(model: TaskPageGitHubCacheReconciliationModel) { const { settings, repos, selectedRepos } = model const [newIssueOpen, setNewIssueOpen] = useState(false) diff --git a/src/renderer/src/components/use-task-page-github-landing-refresh.ts b/src/renderer/src/components/task-page/github/use-task-page-github-landing-refresh.ts similarity index 100% rename from src/renderer/src/components/use-task-page-github-landing-refresh.ts rename to src/renderer/src/components/task-page/github/use-task-page-github-landing-refresh.ts diff --git a/src/renderer/src/components/use-task-page-github-list-projection.ts b/src/renderer/src/components/task-page/github/use-task-page-github-list-projection.ts similarity index 97% rename from src/renderer/src/components/use-task-page-github-list-projection.ts rename to src/renderer/src/components/task-page/github/use-task-page-github-list-projection.ts index 8769f74fb09..74b917a65cf 100644 --- a/src/renderer/src/components/use-task-page-github-list-projection.ts +++ b/src/renderer/src/components/task-page/github/use-task-page-github-list-projection.ts @@ -1,7 +1,7 @@ -import type { TaskPageJiraCreationMetadataModel } from './use-task-page-jira-creation-metadata' +import type { TaskPageJiraCreationMetadataModel } from '../../use-task-page-jira-creation-metadata' import { getWorkItemRepo } from '@/lib/work-item-repo-row' import { useCallback, useMemo, useEffect } from 'react' -import type { GitHubWorkItem } from '../../../shared/github/work-item-types' +import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types' import { taskPageGitHubItemKey } from '@/components/task-page/github/task-page-github-work-item-mutation-keys' import { deriveTaskPagePRCheckSummary } from '@/components/task-page-pr-check-summary' import { deriveAdvertisedTotalPages } from '@/components/task-page-work-item-pagination' @@ -10,7 +10,7 @@ import { GITHUB_TASK_GRID_CLASS, PR_CHECKS_EAGER_PREFETCH_LIMIT, getTaskPageRepoSourceContext -} from './task-page-source-context' +} from '../../task-page-source-context' import { sameOptionalGitHubOwnerRepo } from './task-page-github-review-model' export function useTaskPageGitHubListProjection(model: TaskPageJiraCreationMetadataModel) { const { diff --git a/src/renderer/src/components/use-task-page-github-list-state.ts b/src/renderer/src/components/task-page/github/use-task-page-github-list-state.ts similarity index 95% rename from src/renderer/src/components/use-task-page-github-list-state.ts rename to src/renderer/src/components/task-page/github/use-task-page-github-list-state.ts index 9c88774a5cf..6d47852a5c0 100644 --- a/src/renderer/src/components/use-task-page-github-list-state.ts +++ b/src/renderer/src/components/task-page/github/use-task-page-github-list-state.ts @@ -1,16 +1,20 @@ -import type { TaskPageProviderStateModel } from './use-task-page-provider-state' +import type { TaskPageProviderStateModel } from '../../use-task-page-provider-state' import { useState, useRef, useEffect, useLayoutEffect } from 'react' -import type { TaskViewPresetId } from '../../../shared/ui-chrome-types' -import type { GitHubWorkItem } from '../../../shared/github/work-item-types' -import { PER_REPO_FETCH_LIMIT, CROSS_REPO_DISPLAY_LIMIT } from '@/lib/new-workspace' +import type { TaskViewPresetId } from '../../../../../shared/ui-chrome-types' +import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types' +import { + PER_REPO_FETCH_LIMIT, + CROSS_REPO_DISPLAY_LIMIT, + getTaskPagePerRepoLimit, + sortWorkItemsByNumber +} from '../../../../../shared/work-items' import { buildTaskPageGitHubResumeContextKey, taskPageGitHubResumeCache -} from '@/components/task-page-github-resume-cache' -import { getTaskPagePerRepoLimit, sortWorkItemsByNumber } from '../../../shared/work-items' -import { useAppStore } from '@/store' +} from '@/components/task-page/github/task-page-github-resume-cache' +import { useAppStore } from '@/store/index' import type { GitHubListRestoreWrite } from './task-page-github-list-scroll-restore' -import { getTaskPageRepoSourceContext } from './task-page-source-context' +import { getTaskPageRepoSourceContext } from '../../task-page-source-context' export function useTaskPageGitHubListState(model: TaskPageProviderStateModel) { const { pageData, diff --git a/src/renderer/src/components/use-task-page-github-quiet-refresh-effect.ts b/src/renderer/src/components/task-page/github/use-task-page-github-quiet-refresh-effect.ts similarity index 100% rename from src/renderer/src/components/use-task-page-github-quiet-refresh-effect.ts rename to src/renderer/src/components/task-page/github/use-task-page-github-quiet-refresh-effect.ts diff --git a/src/renderer/src/components/use-task-page-github-quiet-refresh.ts b/src/renderer/src/components/task-page/github/use-task-page-github-quiet-refresh.ts similarity index 100% rename from src/renderer/src/components/use-task-page-github-quiet-refresh.ts rename to src/renderer/src/components/task-page/github/use-task-page-github-quiet-refresh.ts diff --git a/src/renderer/src/components/use-task-page-github-search-pagination.ts b/src/renderer/src/components/task-page/github/use-task-page-github-search-pagination.ts similarity index 96% rename from src/renderer/src/components/use-task-page-github-search-pagination.ts rename to src/renderer/src/components/task-page/github/use-task-page-github-search-pagination.ts index f47741a81a2..9fa60b9f487 100644 --- a/src/renderer/src/components/use-task-page-github-search-pagination.ts +++ b/src/renderer/src/components/task-page/github/use-task-page-github-search-pagination.ts @@ -1,7 +1,7 @@ import type { TaskPageGitHubListProjectionModel } from './use-task-page-github-list-projection' import { useCallback, useEffect } from 'react' -import { stripRepoQualifiers } from '../../../shared/task-query' -import { taskPageToGitHubApiPage } from '../../../shared/work-items' +import { stripRepoQualifiers } from '../../../../../shared/task-query' +import { taskPageToGitHubApiPage } from '../../../../../shared/work-items' import { resolveEmptyPageOutcome, applyWindowPageLimit, @@ -10,9 +10,9 @@ import { import { toast } from 'sonner' import { translate } from '@/i18n/i18n' import { overlayPendingOnTaskPagePages } from '@/components/task-page/github/task-page-github-work-item-mutation-pages' -import { scopeGitHubTaskSearch } from '@/components/task-page-github-task-kind' +import { scopeGitHubTaskSearch } from '../../../../../shared/task-github-search' import { useGitHubTaskSearchCommit } from '@/components/use-github-task-search-commit' -import { getTaskPageRepoSourceContext } from './task-page-source-context' +import { getTaskPageRepoSourceContext } from '../../task-page-source-context' export function useTaskPageGitHubSearchPagination(model: TaskPageGitHubListProjectionModel) { const { setTaskResumeState, diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-project-creation.ts b/src/renderer/src/components/task-page/linear/use-task-page-linear-project-creation.ts index e963da7a2ac..65d56cb98aa 100644 --- a/src/renderer/src/components/task-page/linear/use-task-page-linear-project-creation.ts +++ b/src/renderer/src/components/task-page/linear/use-task-page-linear-project-creation.ts @@ -1,4 +1,4 @@ -import type { TaskPageGitHubIssueCreationModel } from '../../use-task-page-github-issue-creation' +import type { TaskPageGitHubIssueCreationModel } from '../github/use-task-page-github-issue-creation' import { useCallback } from 'react' import { linearCreateProject } from '@/runtime/runtime-linear-project-client' import { toast } from 'sonner' diff --git a/src/renderer/src/components/use-task-page-detail-routing.ts b/src/renderer/src/components/use-task-page-detail-routing.ts index a0b39c78e53..fa96141ad32 100644 --- a/src/renderer/src/components/use-task-page-detail-routing.ts +++ b/src/renderer/src/components/use-task-page-detail-routing.ts @@ -1,4 +1,4 @@ -import type { TaskPageGitHubIssueDraftModel } from './use-task-page-github-issue-draft' +import type { TaskPageGitHubIssueDraftModel } from './task-page/github/use-task-page-github-issue-draft' import { useState, useMemo, useCallback } from 'react' import type { LinearIssue } from '../../../shared/linear/issue-types' import type { JiraIssue } from '../../../shared/jira/jira-types' diff --git a/src/renderer/src/components/use-task-page-jira-project-scope.test.tsx b/src/renderer/src/components/use-task-page-jira-project-scope.test.tsx index 29bfaadc6f9..cf5f5ca69af 100644 --- a/src/renderer/src/components/use-task-page-jira-project-scope.test.tsx +++ b/src/renderer/src/components/use-task-page-jira-project-scope.test.tsx @@ -12,10 +12,10 @@ import { useTaskPageRepoSelection } from './use-task-page-repo-selection' import { useTaskPageRuntimeHosts } from './use-task-page-runtime-hosts' import { useTaskPageSourceAvailability } from './use-task-page-source-availability' import { useTaskPageProviderState } from './use-task-page-provider-state' -import { useTaskPageGitHubListState } from './use-task-page-github-list-state' -import { useTaskPageGitHubDetail } from './use-task-page-github-detail' -import { useTaskPageGitHubCacheReconciliation } from './use-task-page-github-cache-reconciliation' -import { useTaskPageGitHubIssueDraft } from './use-task-page-github-issue-draft' +import { useTaskPageGitHubListState } from './task-page/github/use-task-page-github-list-state' +import { useTaskPageGitHubDetail } from './task-page/github/use-task-page-github-detail' +import { useTaskPageGitHubCacheReconciliation } from './task-page/github/use-task-page-github-cache-reconciliation' +import { useTaskPageGitHubIssueDraft } from './task-page/github/use-task-page-github-issue-draft' import { useTaskPageDetailRouting } from './use-task-page-detail-routing' import { useTaskPageLinearViewState } from './task-page/linear/use-task-page-linear-view-state' const { readSavedFilters, mutateSavedFilters, readQuickFilters, writeQuickFilters } = vi.hoisted( diff --git a/src/renderer/src/components/use-task-page-resume-restoration.ts b/src/renderer/src/components/use-task-page-resume-restoration.ts index 9eb60e8ace7..99c4c76347d 100644 --- a/src/renderer/src/components/use-task-page-resume-restoration.ts +++ b/src/renderer/src/components/use-task-page-resume-restoration.ts @@ -1,7 +1,7 @@ import type { TaskPageJiraListStateModel } from './use-task-page-jira-list-state' import { useEffect } from 'react' import { resolveVisibleTaskProvider } from '../../../shared/task-providers' -import { normalizeGitHubTaskPreset } from '@/components/task-page-github-task-kind' +import { normalizeGitHubTaskPreset } from '../../../shared/task-github-search' import { getTaskPresetQuery } from '../../../shared/task-preset-query' import { loadLinearIssueView } from './linear-issue-view-storage' export function useTaskPageResumeRestoration(model: TaskPageJiraListStateModel) { diff --git a/src/renderer/src/components/use-task-page-runtime-hosts.ts b/src/renderer/src/components/use-task-page-runtime-hosts.ts index 4148474214d..4934cae35f3 100644 --- a/src/renderer/src/components/use-task-page-runtime-hosts.ts +++ b/src/renderer/src/components/use-task-page-runtime-hosts.ts @@ -1,9 +1,8 @@ import type { TaskPageRepoSelectionModel } from './use-task-page-repo-selection' -import { normalizeGitHubTaskPreset } from '@/components/task-page-github-task-kind' +import { normalizeGitHubTaskPreset } from '../../../shared/task-github-search' import { getTaskPresetQuery } from '../../../shared/task-preset-query' import { useState, useRef, useEffect, useMemo } from 'react' -import type { TaskProvider } from '../../../shared/task-providers' -import { resolveVisibleTaskProvider } from '../../../shared/task-providers' +import { type TaskProvider, resolveVisibleTaskProvider } from '../../../shared/task-providers' import type { TaskSourceContext } from '../../../shared/task-source-context' import type { RuntimeProviderPreflightStatus } from '@/components/task-source-provider-availability' import { buildExecutionHostRegistry } from '../../../shared/execution-host-registry' diff --git a/src/renderer/src/components/use-task-page-search-actions.ts b/src/renderer/src/components/use-task-page-search-actions.ts index 63549591c15..fb86018357b 100644 --- a/src/renderer/src/components/use-task-page-search-actions.ts +++ b/src/renderer/src/components/use-task-page-search-actions.ts @@ -1,10 +1,10 @@ -import type { TaskPageGitHubQuietRefreshModel } from './use-task-page-github-quiet-refresh' +import type { TaskPageGitHubQuietRefreshModel } from './task-page/github/use-task-page-github-quiet-refresh' import React, { useCallback, useEffect } from 'react' import type { PRFilterChange } from '@/components/github/PRFilterDropdowns' import { scopeGitHubTaskSearch, getDefaultPresetForGitHubTaskKind -} from '@/components/task-page-github-task-kind' +} from '../../../shared/task-github-search' import { withQualifier } from '../../../shared/task-query' import type { TaskViewPresetId } from '../../../shared/ui-chrome-types' import { toast } from 'sonner'