diff --git a/config/flaky-test-pattern-baseline.txt b/config/flaky-test-pattern-baseline.txt index 71739d272ec..9224da0c7ef 100644 --- a/config/flaky-test-pattern-baseline.txt +++ b/config/flaky-test-pattern-baseline.txt @@ -1131,7 +1131,7 @@ 1 test-no-wall-clock:src/renderer/src/components/tab-bar/TabBarCreateEntry.history.test.tsx 2 test-no-wall-clock:src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts 1 test-no-wall-clock:src/renderer/src/components/tab-bar/open-tab-search.test.ts -4 test-no-wall-clock:src/renderer/src/components/task-page-jira-cache-selectors.test.ts +4 test-no-wall-clock:src/renderer/src/components/task-page/jira/task-page-jira-cache-selectors.test.ts 1 test-no-wall-clock:src/renderer/src/components/task-page-jira-saved-filter-load-failure.test.tsx 1 test-no-wall-clock:src/renderer/src/components/terminal-pane/cache-timer-seeding.test.ts 2 test-no-wall-clock:src/renderer/src/components/terminal-pane/fish-color-scheme-child-stdin.node-pty.test.ts diff --git a/config/scripts/ci-shard-timings.json b/config/scripts/ci-shard-timings.json index 605bdb1d61e..28076741a2c 100644 --- a/config/scripts/ci-shard-timings.json +++ b/config/scripts/ci-shard-timings.json @@ -9421,7 +9421,7 @@ "src/renderer/src/components/task-page-jira-board-transitions.test.ts": 60, "src/renderer/src/components/task-page-jira-board-view.test.tsx": 1408, "src/renderer/src/components/task-page-jira-board.test.tsx": 1616, - "src/renderer/src/components/task-page-jira-cache-selectors.test.ts": 66, + "src/renderer/src/components/task-page/jira/task-page-jira-cache-selectors.test.ts": 66, "src/renderer/src/components/task-page-jira-create-fields.test.ts": 66, "src/renderer/src/components/task-page-jira-favourite-catalogue.test.tsx": 2450, "src/renderer/src/components/task-page-jira-favourite-selection.test.tsx": 3325, @@ -9429,7 +9429,7 @@ "src/renderer/src/components/task-page/jira/task-page-jira-item-source-context.test.ts": 31, "src/renderer/src/components/task-page/jira/task-page-jira-linked-issues.test.ts": 54, "src/renderer/src/components/task-page/jira/task-page-jira-load-state.test.ts": 48, - "src/renderer/src/components/task-page-jira-project-selection.test.ts": 28, + "src/renderer/src/components/task-page/jira/task-page-jira-project-selection.test.ts": 28, "src/renderer/src/components/task-page-jira-quick-copy.test.tsx": 2171, "src/renderer/src/components/task-page-jira-saved-filter-application.test.tsx": 1838, "src/renderer/src/components/task-page-jira-saved-filter-load-failure.test.tsx": 2974, diff --git a/src/renderer/src/components/jira-project-picker.tsx b/src/renderer/src/components/jira-project-picker.tsx index 2383d494c8e..09367dead69 100644 --- a/src/renderer/src/components/jira-project-picker.tsx +++ b/src/renderer/src/components/jira-project-picker.tsx @@ -9,7 +9,7 @@ import { import { Button } from './ui/button' import { Popover, PopoverContent, PopoverTrigger } from './ui/popover' import { Command, CommandInput, CommandList, CommandEmpty, CommandItem } from './ui/command' -import { getJiraProjectSelectionKey } from './task-page-jira-project-selection' +import { getJiraProjectSelectionKey } from './task-page/jira/task-page-jira-project-selection' import { translate } from '@/i18n/i18n' export function JiraProjectPicker({ diff --git a/src/renderer/src/components/task-page-jira-status-catalog.ts b/src/renderer/src/components/task-page-jira-status-catalog.ts index 81f9fe962a6..5e9505ff4ff 100644 --- a/src/renderer/src/components/task-page-jira-status-catalog.ts +++ b/src/renderer/src/components/task-page-jira-status-catalog.ts @@ -1,6 +1,6 @@ import type { JiraIssue } from '../../../shared/jira/jira-types' import type { JiraProjectReference } from '../../../shared/jira/jira-project-reference' -import { getJiraProjectSelectionKey } from './task-page-jira-project-selection' +import { getJiraProjectSelectionKey } from './task-page/jira/task-page-jira-project-selection' export function getJiraStatusCatalogScopeKey( sourceScopeKey: string, diff --git a/src/renderer/src/components/task-page/jira/Filters.tsx b/src/renderer/src/components/task-page/jira/Filters.tsx index 2ee8092c02a..35d55c9c97f 100644 --- a/src/renderer/src/components/task-page/jira/Filters.tsx +++ b/src/renderer/src/components/task-page/jira/Filters.tsx @@ -6,7 +6,7 @@ import { cn } from '@/lib/utils' import { Tooltip, TooltipTrigger, TooltipContent } from '@/components/ui/tooltip' import { Button } from '@/components/ui/button' import { useAppStore } from '@/store' -import { getJiraProjectSelectionKey } from '@/components/task-page-jira-project-selection' +import { getJiraProjectSelectionKey } from '@/components/task-page/jira/task-page-jira-project-selection' import { translate } from '@/i18n/i18n' import { LoaderCircle, Plus, RefreshCw, Search, X } from 'lucide-react' import { Input } from '@/components/ui/input' diff --git a/src/renderer/src/components/task-page/jira/IssueAssigneeField.tsx b/src/renderer/src/components/task-page/jira/IssueAssigneeField.tsx index fa40a9dfe1f..6400aec2e71 100644 --- a/src/renderer/src/components/task-page/jira/IssueAssigneeField.tsx +++ b/src/renderer/src/components/task-page/jira/IssueAssigneeField.tsx @@ -3,7 +3,7 @@ import type { TaskPageComposerActionsModel } from '../use-task-page-composer-act import { getJiraSelfUser } from '@/components/jira-self-user' import { JiraUserPicker, type JiraUserPickerFixedOption } from '@/components/jira-user-picker' import { hasJiraAssigneeCreateField } from '@/components/task-page/jira/task-page-jira-create-fields' -import { getJiraProjectSelectionKey } from '@/components/task-page-jira-project-selection' +import { getJiraProjectSelectionKey } from '@/components/task-page/jira/task-page-jira-project-selection' import { jiraListAssignableUsersForProject } from '@/runtime/runtime-jira-client' import { translate } from '@/i18n/i18n' import { defaultScopeSource } from '@/lib/default-creation-host' diff --git a/src/renderer/src/components/task-page/jira/IssueDialog.tsx b/src/renderer/src/components/task-page/jira/IssueDialog.tsx index faca9a1e3ae..c15980e83b0 100644 --- a/src/renderer/src/components/task-page/jira/IssueDialog.tsx +++ b/src/renderer/src/components/task-page/jira/IssueDialog.tsx @@ -21,7 +21,7 @@ import { CommandEmpty, CommandItem } from '@/components/ui/command' -import { getJiraProjectSelectionKey } from '@/components/task-page-jira-project-selection' +import { getJiraProjectSelectionKey } from '@/components/task-page/jira/task-page-jira-project-selection' import { cn } from '@/lib/utils' import { Select, diff --git a/src/renderer/src/components/task-page-jira-cache-selectors.test.ts b/src/renderer/src/components/task-page/jira/task-page-jira-cache-selectors.test.ts similarity index 95% rename from src/renderer/src/components/task-page-jira-cache-selectors.test.ts rename to src/renderer/src/components/task-page/jira/task-page-jira-cache-selectors.test.ts index b2e88f9298c..31944897ec5 100644 --- a/src/renderer/src/components/task-page-jira-cache-selectors.test.ts +++ b/src/renderer/src/components/task-page/jira/task-page-jira-cache-selectors.test.ts @@ -2,8 +2,8 @@ import { describe, expect, it } from 'vitest' import { getTaskSourceCacheScope, type TaskSourceContext -} from '../../../shared/task-source-context' -import type { JiraIssue } from '../../../shared/jira/jira-types' +} from '../../../../../shared/task-source-context' +import type { JiraIssue } from '../../../../../shared/jira/jira-types' import { findTaskPageJiraIssue } from './task-page-jira-cache-selectors' function jiraSourceContext(environmentId: string): TaskSourceContext { diff --git a/src/renderer/src/components/task-page-jira-cache-selectors.ts b/src/renderer/src/components/task-page/jira/task-page-jira-cache-selectors.ts similarity index 92% rename from src/renderer/src/components/task-page-jira-cache-selectors.ts rename to src/renderer/src/components/task-page/jira/task-page-jira-cache-selectors.ts index 4ee2c94c648..df68337b206 100644 --- a/src/renderer/src/components/task-page-jira-cache-selectors.ts +++ b/src/renderer/src/components/task-page/jira/task-page-jira-cache-selectors.ts @@ -2,8 +2,8 @@ import type { CacheEntry } from '@/store/github/cache-model' import { getTaskSourceCacheScope, type TaskSourceContext -} from '../../../shared/task-source-context' -import type { JiraIssue } from '../../../shared/jira/jira-types' +} from '../../../../../shared/task-source-context' +import type { JiraIssue } from '../../../../../shared/jira/jira-types' type JiraIssueCache = Record> type JiraSearchCache = Record> diff --git a/src/renderer/src/components/task-page-jira-project-selection.test.ts b/src/renderer/src/components/task-page/jira/task-page-jira-project-selection.test.ts similarity index 97% rename from src/renderer/src/components/task-page-jira-project-selection.test.ts rename to src/renderer/src/components/task-page/jira/task-page-jira-project-selection.test.ts index cf0ade653cb..a05075ea236 100644 --- a/src/renderer/src/components/task-page-jira-project-selection.test.ts +++ b/src/renderer/src/components/task-page/jira/task-page-jira-project-selection.test.ts @@ -4,7 +4,7 @@ import { compareJiraProjectsByDisplayLabel, getJiraProjectSelectionKey } from './task-page-jira-project-selection' -import type { JiraProject } from '../../../shared/jira/jira-types' +import type { JiraProject } from '../../../../../shared/jira/jira-types' function project(overrides: Partial = {}): JiraProject { return { id: '1', key: 'AA', name: 'Alpha', ...overrides } diff --git a/src/renderer/src/components/task-page-jira-project-selection.ts b/src/renderer/src/components/task-page/jira/task-page-jira-project-selection.ts similarity index 91% rename from src/renderer/src/components/task-page-jira-project-selection.ts rename to src/renderer/src/components/task-page/jira/task-page-jira-project-selection.ts index a6b1e002201..61f537e2c5e 100644 --- a/src/renderer/src/components/task-page-jira-project-selection.ts +++ b/src/renderer/src/components/task-page/jira/task-page-jira-project-selection.ts @@ -1,4 +1,4 @@ -import type { JiraProject } from '../../../shared/jira/jira-types' +import type { JiraProject } from '../../../../../shared/jira/jira-types' import { uiCollator } from '@/i18n/ui-intl-formatters' export function getJiraProjectSelectionKey(project: JiraProject): string { diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-creation-projects.ts b/src/renderer/src/components/task-page/jira/use-task-page-jira-creation-projects.ts index e9076162b34..2d61ba39987 100644 --- a/src/renderer/src/components/task-page/jira/use-task-page-jira-creation-projects.ts +++ b/src/renderer/src/components/task-page/jira/use-task-page-jira-creation-projects.ts @@ -7,7 +7,7 @@ import { isVisibleJiraCreateField } from '@/components/task-page/jira/task-page- import { compareJiraProjectsByDisplayLabel, getJiraProjectSelectionKey -} from '@/components/task-page-jira-project-selection' +} from '@/components/task-page/jira/task-page-jira-project-selection' import type { TaskPageJiraCreationStatePreludeModel } from './use-task-page-jira-creation-state' diff --git a/src/renderer/src/components/task-page/use-task-page-detail-routing.ts b/src/renderer/src/components/task-page/use-task-page-detail-routing.ts index 2ed64ccd903..6fe882df5c6 100644 --- a/src/renderer/src/components/task-page/use-task-page-detail-routing.ts +++ b/src/renderer/src/components/task-page/use-task-page-detail-routing.ts @@ -5,7 +5,7 @@ import type { JiraIssue } from '../../../../shared/jira/jira-types' import { useAppStore } from '@/store' import { useShallow } from 'zustand/react/shallow' import { findTaskPageLinearIssue } from './linear/task-page-linear-cache-selectors' -import { findTaskPageJiraIssue } from '@/components/task-page-jira-cache-selectors' +import { findTaskPageJiraIssue } from '@/components/task-page/jira/task-page-jira-cache-selectors' export function useTaskPageDetailRouting(model: TaskPageGitHubIssueDraftModel) { const { pageData, diff --git a/src/renderer/src/components/use-task-page-jira-list-projection.ts b/src/renderer/src/components/use-task-page-jira-list-projection.ts index 519810e634b..79d6f11e6b4 100644 --- a/src/renderer/src/components/use-task-page-jira-list-projection.ts +++ b/src/renderer/src/components/use-task-page-jira-list-projection.ts @@ -1,6 +1,6 @@ import type { TaskPageLinearBoardModel } from './task-page/linear/use-task-page-linear-board' import { useMemo, useCallback } from 'react' -import { findTaskPageJiraIssue } from '@/components/task-page-jira-cache-selectors' +import { findTaskPageJiraIssue } from '@/components/task-page/jira/task-page-jira-cache-selectors' import { getSingleJiraProjectScope, getTaskPageJiraStatusOrderScopeKey,