Remove index.ts that imports and re-exports to avoid circular dependency

felipecrs · felipecrs · commit 1548b355b8bd · 2025-04-30T18:47:54.000-03:00
diff --git a/src/main/frontend/common/RestClient.tsx b/src/main/frontend/common/RestClient.tsx
@@ -1,8 +1,8 @@
 import {
   Result,
   StageInfo,
-} from "../pipeline-graph-view/pipeline-graph/main/index.ts";
-import { ResourceBundle } from "./i18n/index.ts";
+} from "../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";
+import { ResourceBundle } from "./i18n/messages.ts";
 
 export interface RunStatus {
   stages: StageInfo[];
diff --git a/src/main/frontend/common/components/dropdown-portal.tsx b/src/main/frontend/common/components/dropdown-portal.tsx
@@ -1,5 +1,5 @@
-import {ReactNode} from "react";
-import {createPortal} from "react-dom";
+import { ReactNode } from "react";
+import { createPortal } from "react-dom";
 
 interface DropdownPortalProps {
   children: ReactNode;
diff --git a/src/main/frontend/common/components/filter.tsx b/src/main/frontend/common/components/filter.tsx
@@ -4,7 +4,7 @@ import Tippy from "@tippyjs/react";
 import { useState } from "react";
 
 import { useFilter } from "../../pipeline-console-view/pipeline-console/main/providers/filter-provider.tsx";
-import { Result } from "../../pipeline-graph-view/pipeline-graph/main/index.ts";
+import { Result } from "../../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";
 import { classNames } from "../utils/classnames.ts";
 import { DefaultDropdownProps } from "./dropdown.tsx";
 import StatusIcon from "./status-icon.tsx";
diff --git a/src/main/frontend/common/components/status-icon.tsx b/src/main/frontend/common/components/status-icon.tsx
@@ -2,7 +2,7 @@ import "./status-icon.scss";
 
 import { ReactNode } from "react";
 
-import { Result } from "../../pipeline-graph-view/pipeline-graph/main/index.ts";
+import { Result } from "../../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";
 
 /**
  * Visual representation of a job or build status
diff --git a/src/main/frontend/common/i18n/index.ts b/src/main/frontend/common/i18n/index.ts
diff --git a/src/main/frontend/common/utils/run-estimator.spec.ts b/src/main/frontend/common/utils/run-estimator.spec.ts
@@ -1,7 +1,7 @@
 import {
   Result,
   StageInfo,
-} from "../../pipeline-graph-view/pipeline-graph/main/index.ts";
+} from "../../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";
 import RunEstimator from "./run-estimator.ts";
 
 const previous: StageInfo[] = [
diff --git a/src/main/frontend/common/utils/run-estimator.ts b/src/main/frontend/common/utils/run-estimator.ts
@@ -1,7 +1,7 @@
 import {
   Result,
   StageInfo,
-} from "../../pipeline-graph-view/pipeline-graph/main/index.ts";
+} from "../../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";
 
 export default class RunEstimator {
   private stagesLookup: Map<String, StageInfo>;
diff --git a/src/main/frontend/common/utils/stage-merge.spec.ts b/src/main/frontend/common/utils/stage-merge.spec.ts
@@ -1,7 +1,7 @@
 import {
   Result,
   StageInfo,
-} from "../../pipeline-graph-view/pipeline-graph/main/index.ts";
+} from "../../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";
 import { mergeStageInfos } from "./stage-merge.ts";
 
 describe("mergeStageInfos", () => {
diff --git a/src/main/frontend/common/utils/stage-merge.ts b/src/main/frontend/common/utils/stage-merge.ts
@@ -1,4 +1,4 @@
-import { StageInfo } from "../../pipeline-graph-view/pipeline-graph/main/index.ts";
+import { StageInfo } from "../../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";
 import RunEstimator from "./run-estimator.ts";
 
 export const mergeStageInfos = (
diff --git a/src/main/frontend/common/utils/timings.spec.tsx b/src/main/frontend/common/utils/timings.spec.tsx
@@ -3,7 +3,8 @@
 import { render } from "@testing-library/react";
 import { vi } from "vitest";
 
-import { I18NContext, Messages } from "../i18n/index.ts";
+import { I18NContext } from "../i18n/i18n-provider.tsx";
+import { Messages } from "../i18n/messages.ts";
 import { Paused, Started, Total } from "./timings.tsx";
 
 describe("Timings", () => {
diff --git a/src/main/frontend/common/utils/timings.tsx b/src/main/frontend/common/utils/timings.tsx
@@ -1,6 +1,7 @@
 import { useContext } from "react";
 
-import { I18NContext, Messages } from "../i18n/index.ts";
+import { I18NContext } from "../i18n/i18n-provider";
+import { Messages } from "../i18n/messages";
 
 const ONE_SECOND_MS: number = 1000;
 const ONE_MINUTE_MS: number = 60 * ONE_SECOND_MS;
diff --git a/src/main/frontend/multi-pipeline-graph-view/app.tsx b/src/main/frontend/multi-pipeline-graph-view/app.tsx
@@ -3,8 +3,9 @@ import "./multi-pipeline-graph/styles/main.scss";
 
 import { FunctionComponent } from "react";
 
-import { I18NProvider, ResourceBundleName } from "../common/i18n/index.ts";
-import { MultiPipelineGraph } from "./multi-pipeline-graph/main/index.ts";
+import { I18NProvider } from "../common/i18n/i18n-provider.tsx";
+import { ResourceBundleName } from "../common/i18n/messages.ts";
+import { MultiPipelineGraph } from "./multi-pipeline-graph/main/MultiPipelineGraph.tsx";
 
 const App: FunctionComponent = () => {
   const locale =
diff --git a/src/main/frontend/multi-pipeline-graph-view/multi-pipeline-graph/main/MultiPipelineGraph.tsx b/src/main/frontend/multi-pipeline-graph-view/multi-pipeline-graph/main/MultiPipelineGraph.tsx
@@ -1,6 +1,6 @@
 import { useContext, useEffect, useState } from "react";
 
-import { I18NContext } from "../../../common/i18n/index.ts";
+import { I18NContext } from "../../../common/i18n/i18n-provider.tsx";
 import { RunInfo } from "./MultiPipelineGraphModel.ts";
 import SingleRun from "./SingleRun.tsx";
 import startPollingRunsStatus from "./support/startPollingRunsStatus.ts";
diff --git a/src/main/frontend/multi-pipeline-graph-view/multi-pipeline-graph/main/MultiPipelineGraphModel.ts b/src/main/frontend/multi-pipeline-graph-view/multi-pipeline-graph/main/MultiPipelineGraphModel.ts
@@ -1,4 +1,4 @@
-import { Result } from "../../../pipeline-graph-view/pipeline-graph/main/index.ts";
+import { Result } from "../../../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";
 
 export interface RunInfo {
   id: string;
diff --git a/src/main/frontend/multi-pipeline-graph-view/multi-pipeline-graph/main/SingleRun.tsx b/src/main/frontend/multi-pipeline-graph-view/multi-pipeline-graph/main/SingleRun.tsx
@@ -3,9 +3,11 @@ import "./single-run.scss";
 import StatusIcon from "../../../common/components/status-icon.tsx";
 import useRunPoller from "../../../common/tree-api.ts";
 import { time, Total } from "../../../common/utils/timings.tsx";
-import { LayoutInfo } from "../../../pipeline-graph-view/pipeline-graph/main/index.ts";
 import { PipelineGraph } from "../../../pipeline-graph-view/pipeline-graph/main/PipelineGraph.tsx";
-import { defaultLayout } from "../../../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";
+import {
+  defaultLayout,
+  LayoutInfo,
+} from "../../../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";
 import { RunInfo } from "./MultiPipelineGraphModel.ts";
 
 export default function SingleRun({ run, currentJobPath }: SingleRunProps) {
diff --git a/src/main/frontend/multi-pipeline-graph-view/multi-pipeline-graph/main/index.ts b/src/main/frontend/multi-pipeline-graph-view/multi-pipeline-graph/main/index.ts
diff --git a/src/main/frontend/pipeline-console-view/app.tsx b/src/main/frontend/pipeline-console-view/app.tsx
@@ -1,6 +1,7 @@
 import { lazy } from "react";
 
-import { I18NProvider, ResourceBundleName } from "../common/i18n/index.ts";
+import { I18NProvider } from "../common/i18n/i18n-provider.tsx";
+import { ResourceBundleName } from "../common/i18n/messages.ts";
 import { FilterProvider } from "./pipeline-console/main/providers/filter-provider.tsx";
 import { LayoutPreferencesProvider } from "./pipeline-console/main/providers/user-preference-provider.tsx";
 
diff --git a/src/main/frontend/pipeline-console-view/pipeline-console/main/DataTreeView.tsx b/src/main/frontend/pipeline-console-view/pipeline-console/main/DataTreeView.tsx
@@ -15,7 +15,7 @@ import { Total } from "../../../common/utils/timings.tsx";
 import {
   Result,
   StageInfo,
-} from "../../../pipeline-graph-view/pipeline-graph/main/index.ts";
+} from "../../../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";
 import { useFilter } from "./providers/filter-provider.tsx";
 
 export default function DataTreeView({
diff --git a/src/main/frontend/pipeline-console-view/pipeline-console/main/components/stages.tsx b/src/main/frontend/pipeline-console-view/pipeline-console/main/components/stages.tsx
@@ -10,8 +10,8 @@ import {
 
 import Tooltip from "../../../../common/components/tooltip.tsx";
 import { classNames } from "../../../../common/utils/classnames.ts";
-import { StageInfo } from "../../../../pipeline-graph-view/pipeline-graph/main/index.ts";
 import { PipelineGraph } from "../../../../pipeline-graph-view/pipeline-graph/main/PipelineGraph.tsx";
+import { StageInfo } from "../../../../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";
 import { StageViewPosition } from "../providers/user-preference-provider.tsx";
 
 export default function Stages({
diff --git a/src/main/frontend/pipeline-console-view/pipeline-console/main/providers/filter-provider.tsx b/src/main/frontend/pipeline-console-view/pipeline-console/main/providers/filter-provider.tsx
@@ -1,6 +1,6 @@
 import { createContext, ReactNode, useContext, useState } from "react";
 
-import { Result } from "../../../../pipeline-graph-view/pipeline-graph/main/index.ts";
+import { Result } from "../../../../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";
 
 interface FilterContextType {
   visibleStatuses: Result[];
diff --git a/src/main/frontend/pipeline-console-view/pipeline-console/main/split-view.tsx b/src/main/frontend/pipeline-console-view/pipeline-console/main/split-view.tsx
@@ -1,6 +1,13 @@
 import "./split-view.scss";
 
-import { Children, MouseEvent as ReactMouseEvent, ReactNode, useEffect, useRef, useState } from "react";
+import {
+  Children,
+  MouseEvent as ReactMouseEvent,
+  ReactNode,
+  useEffect,
+  useRef,
+  useState,
+} from "react";
 
 import { useLayoutPreferences } from "./providers/user-preference-provider.tsx";
 
diff --git a/src/main/frontend/pipeline-console-view/pipeline-console/main/stage-details.spec.tsx b/src/main/frontend/pipeline-console-view/pipeline-console/main/stage-details.spec.tsx
@@ -6,7 +6,7 @@ import { TextEncoder } from "util";
 import {
   Result,
   StageInfo,
-} from "../../../pipeline-graph-view/pipeline-graph/main/index.ts";
+} from "../../../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";
 import StageDetails from "./stage-details.tsx";
 
 (globalThis as any).TextEncoder = TextEncoder;
diff --git a/src/main/frontend/pipeline-console-view/pipeline-console/main/stage-details.tsx b/src/main/frontend/pipeline-console-view/pipeline-console/main/stage-details.tsx
@@ -11,7 +11,7 @@ import {
   Started,
   Total,
 } from "../../../common/utils/timings.tsx";
-import { StageInfo } from "../../../pipeline-graph-view/pipeline-graph/main/index.ts";
+import { StageInfo } from "../../../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";
 import StageNodeLink from "./StageNodeLink.tsx";
 import { DOCUMENT } from "./symbols.tsx";
 
diff --git a/src/main/frontend/pipeline-graph-view/pipeline-graph/main/index.ts b/src/main/frontend/pipeline-graph-view/pipeline-graph/main/index.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { StageInfo } from "../../pipeline-graph-view/pipeline-graph/main/index.ts";`
	`1`	`+import { StageInfo } from "../../pipeline-graph-view/pipeline-graph/main/PipelineGraphModel.tsx";`
`2`	`2`	`import RunEstimator from "./run-estimator.ts";`
`3`	`3`
`4`	`4`	`export const mergeStageInfos = (`