Skip to content

armgit / orca

Public Imported from GitHub
0

Orca is the place for working with a fleet of agents (e.g. Grok Bot, Claude Code). Run any coding agent with your own subscription. Available on desktop, mobile and remote runtime.

refactor(jira): group status and quick-filter owners (#36082)

Neil6be115a06428
diff --git a/config/scripts/ci-shard-timings.json b/config/scripts/ci-shard-timings.json
index 7ea11f1571a..556ddf47f51 100644
--- a/config/scripts/ci-shard-timings.json
+++ b/config/scripts/ci-shard-timings.json
@@ -6975,7 +6975,7 @@
"src/renderer/src/components/StateIndicatorTooltip.test.tsx": 67,
"src/renderer/src/components/TaskPageJiraFavouriteFilters.test.tsx": 1600,
"src/renderer/src/components/TaskPageJiraSavedFilters.test.tsx": 1020,
- "src/renderer/src/components/TaskPageJiraStatusFilters.test.tsx": 686,
+ "src/renderer/src/components/task-page/jira/TaskPageJiraStatusFilters.test.tsx": 686,
"src/renderer/src/components/TerminalSearch.test.tsx": 361,
"src/renderer/src/components/TerminalTitlebarTabs.test.tsx": 162,
"src/renderer/src/components/TerminalWorkbenchContainer.test.tsx": 254,
@@ -10098,7 +10098,7 @@
"src/renderer/src/components/use-task-page-jira-list-effects.test.ts": 2104,
"src/renderer/src/components/use-task-page-jira-list-state.owner.test.tsx": 645,
"src/renderer/src/components/use-task-page-jira-project-scope.test.tsx": 1791,
- "src/renderer/src/components/use-task-page-jira-quick-filters.test.tsx": 1333,
+ "src/renderer/src/components/task-page/jira/use-task-page-jira-quick-filters.test.tsx": 1333,
"src/renderer/src/components/use-task-page-jira-saved-filters.test.tsx": 1287,
"src/renderer/src/components/use-task-page-jira-summary-generation.test.tsx": 415,
"src/renderer/src/components/use-task-page-workspace-actions-twin-host.test.tsx": 1671,
diff --git a/src/renderer/src/components/task-page-jira-saved-filter-load-failure.test.tsx b/src/renderer/src/components/task-page-jira-saved-filter-load-failure.test.tsx
index 16e4a4d3fb9..02e36d988e0 100644
--- a/src/renderer/src/components/task-page-jira-saved-filter-load-failure.test.tsx
+++ b/src/renderer/src/components/task-page-jira-saved-filter-load-failure.test.tsx
@@ -8,7 +8,7 @@ import type { TaskPageLinearCollectionEffectsModel } from './task-page/linear/us
import { createTestStore } from '@/store/slices/store-test-helpers'
import { useTaskPageJiraSavedFilters } from './use-task-page-jira-saved-filters'
import { useTaskPageJiraListEffects } from './use-task-page-jira-list-effects'
-import type { JiraStatusCatalogItem } from './task-page-jira-status-catalog'
+import type { JiraStatusCatalogItem } from './task-page/jira/task-page-jira-status-catalog'
const runtime = vi.hoisted(() => ({
capability: vi.fn(),
diff --git a/src/renderer/src/components/task-page/jira/Filters.tsx b/src/renderer/src/components/task-page/jira/Filters.tsx
index 35d55c9c97f..ff26c90072d 100644
--- a/src/renderer/src/components/task-page/jira/Filters.tsx
+++ b/src/renderer/src/components/task-page/jira/Filters.tsx
@@ -1,4 +1,4 @@
-import { TaskPageJiraStatusFilters } from '../../TaskPageJiraStatusFilters'
+import { TaskPageJiraStatusFilters } from './TaskPageJiraStatusFilters'
import { TaskPageJiraSavedFilters } from '../../TaskPageJiraSavedFilters'
import { TaskPageJiraFavouriteFilters } from '../../TaskPageJiraFavouriteFilters'
import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
diff --git a/src/renderer/src/components/TaskPageJiraStatusFilters.test.tsx b/src/renderer/src/components/task-page/jira/TaskPageJiraStatusFilters.test.tsx
similarity index 98%
rename from src/renderer/src/components/TaskPageJiraStatusFilters.test.tsx
rename to src/renderer/src/components/task-page/jira/TaskPageJiraStatusFilters.test.tsx
index a9a13f23d5d..cde4025c37d 100644
--- a/src/renderer/src/components/TaskPageJiraStatusFilters.test.tsx
+++ b/src/renderer/src/components/task-page/jira/TaskPageJiraStatusFilters.test.tsx
@@ -3,7 +3,7 @@ import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/re
import { afterEach, expect, it, vi } from 'vitest'
import { TaskPageJiraStatusFilters } from './TaskPageJiraStatusFilters'
import { getJiraStatusCatalogScopeKey } from './task-page-jira-status-catalog'
-import type { TaskPageComposerActionsModel } from './task-page/use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
afterEach(cleanup)
function model(): TaskPageComposerActionsModel {
// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This fixture supplies every field read by the status-controls component.
diff --git a/src/renderer/src/components/TaskPageJiraStatusFilters.tsx b/src/renderer/src/components/task-page/jira/TaskPageJiraStatusFilters.tsx
similarity index 94%
rename from src/renderer/src/components/TaskPageJiraStatusFilters.tsx
rename to src/renderer/src/components/task-page/jira/TaskPageJiraStatusFilters.tsx
index e766aebb776..798b7a4435a 100644
--- a/src/renderer/src/components/TaskPageJiraStatusFilters.tsx
+++ b/src/renderer/src/components/task-page/jira/TaskPageJiraStatusFilters.tsx
@@ -2,13 +2,13 @@ import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group'
import { translate } from '@/i18n/i18n'
-import { buildJiraPresetJql } from '../../../shared/jira/jira-preset-jql'
+import { buildJiraPresetJql } from '../../../../../shared/jira/jira-preset-jql'
import {
getJiraStatusCatalogScopeKey,
includeSelectedJiraStatuses
} from './task-page-jira-status-catalog'
-import { restrictJiraQueryToProject } from '../../../shared/jira/jira-project-reference'
-import type { TaskPageComposerActionsModel } from './task-page/use-task-page-composer-actions'
+import { restrictJiraQueryToProject } from '../../../../../shared/jira/jira-project-reference'
+import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
export function TaskPageJiraStatusFilters({
model
diff --git a/src/renderer/src/components/task-page-jira-status-catalog.ts b/src/renderer/src/components/task-page/jira/task-page-jira-status-catalog.ts
similarity index 88%
rename from src/renderer/src/components/task-page-jira-status-catalog.ts
rename to src/renderer/src/components/task-page/jira/task-page-jira-status-catalog.ts
index 5e9505ff4ff..79b9eeb958f 100644
--- a/src/renderer/src/components/task-page-jira-status-catalog.ts
+++ b/src/renderer/src/components/task-page/jira/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/task-page-jira-project-selection'
+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'
export function getJiraStatusCatalogScopeKey(
sourceScopeKey: string,
diff --git a/src/renderer/src/components/use-task-page-jira-quick-filters.test.tsx b/src/renderer/src/components/task-page/jira/use-task-page-jira-quick-filters.test.tsx
similarity index 97%
rename from src/renderer/src/components/use-task-page-jira-quick-filters.test.tsx
rename to src/renderer/src/components/task-page/jira/use-task-page-jira-quick-filters.test.tsx
index df009d304b7..fd3b6030b13 100644
--- a/src/renderer/src/components/use-task-page-jira-quick-filters.test.tsx
+++ b/src/renderer/src/components/task-page/jira/use-task-page-jira-quick-filters.test.tsx
@@ -2,8 +2,11 @@
import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
import { afterEach, beforeEach, expect, it, vi } from 'vitest'
import { useTaskPageJiraQuickFilters } from './use-task-page-jira-quick-filters'
-import type { JiraQuickFilterState } from '../../../shared/jira/jira-quick-filters'
-import { UNRESOLVED_OWNER_HOST_ID, toRuntimeExecutionHostId } from '../../../shared/execution-host'
+import type { JiraQuickFilterState } from '../../../../../shared/jira/jira-quick-filters'
+import {
+ UNRESOLVED_OWNER_HOST_ID,
+ toRuntimeExecutionHostId
+} from '../../../../../shared/execution-host'
const { read, write } = vi.hoisted(() => ({ read: vi.fn(), write: vi.fn() }))
vi.mock('@/runtime/runtime-jira-quick-filter-state', () => ({
readJiraQuickFilterState: read,
diff --git a/src/renderer/src/components/use-task-page-jira-quick-filters.ts b/src/renderer/src/components/task-page/jira/use-task-page-jira-quick-filters.ts
similarity index 96%
rename from src/renderer/src/components/use-task-page-jira-quick-filters.ts
rename to src/renderer/src/components/task-page/jira/use-task-page-jira-quick-filters.ts
index b4b312f7f27..2c1e85da410 100644
--- a/src/renderer/src/components/use-task-page-jira-quick-filters.ts
+++ b/src/renderer/src/components/task-page/jira/use-task-page-jira-quick-filters.ts
@@ -7,8 +7,8 @@ import {
import {
normalizeJiraQuickFilterState,
type JiraQuickFilterState
-} from '../../../shared/jira/jira-quick-filters'
-import type { TaskPageLinearViewStateModel } from './task-page/linear/use-task-page-linear-view-state'
+} from '../../../../../shared/jira/jira-quick-filters'
+import type { TaskPageLinearViewStateModel } from '../linear/use-task-page-linear-view-state'
import { translate } from '@/i18n/i18n'
const EMPTY_QUICK_FILTER_STATE: JiraQuickFilterState = { statuses: [] }
diff --git a/src/renderer/src/components/use-task-page-jira-list-effects.ts b/src/renderer/src/components/use-task-page-jira-list-effects.ts
index f8190ee3380..642bb99615c 100644
--- a/src/renderer/src/components/use-task-page-jira-list-effects.ts
+++ b/src/renderer/src/components/use-task-page-jira-list-effects.ts
@@ -4,7 +4,7 @@ import { withCurrentSprintClause } from '../../../shared/jira/jira-jql-predicate
import {
buildJiraStatusCatalog,
getJiraStatusCatalogScopeKey
-} from './task-page-jira-status-catalog'
+} from './task-page/jira/task-page-jira-status-catalog'
import type { TaskPageLinearCollectionEffectsModel } from './task-page/linear/use-task-page-linear-collection-effects'
import { useEffect, useMemo, useRef } from 'react'
import {
diff --git a/src/renderer/src/components/use-task-page-jira-list-state.ts b/src/renderer/src/components/use-task-page-jira-list-state.ts
index 1970b995380..f3dbe15a806 100644
--- a/src/renderer/src/components/use-task-page-jira-list-state.ts
+++ b/src/renderer/src/components/use-task-page-jira-list-state.ts
@@ -1,5 +1,5 @@
-import { useTaskPageJiraQuickFilters } from './use-task-page-jira-quick-filters'
-import type { JiraStatusCatalogItem } from './task-page-jira-status-catalog'
+import { useTaskPageJiraQuickFilters } from './task-page/jira/use-task-page-jira-quick-filters'
+import type { JiraStatusCatalogItem } from './task-page/jira/task-page-jira-status-catalog'
import { useTaskPageJiraSavedFilters } from './use-task-page-jira-saved-filters'
import { useTaskPageJiraFavouriteFilters } from './use-task-page-jira-favourite-filters'
import type { JiraFavouriteFilter } from '../../../shared/jira/jira-favourite-filters'